Made python library and header detection more robust

setup.py

@@ -505,10 +505,12 @@ class build(_build):
         # make sure build artifacts are generated for the version of Python currently running
         cmake_extra_arch = []
 
-        from distutils.sysconfig import get_python_inc
-        import distutils.sysconfig as sysconfig
-        cmake_extra_arch += ['-DPYTHON_INCLUDE_DIR=' + get_python_inc()]
-        cmake_extra_arch += ['-DPYTHON_LIBRARY=' + sysconfig.get_config_var('LIBDIR')]
+        inc_dir = get_python_inc()
+        lib_dir = get_config_var('LIBDIR')
+        if (inc_dir != None):
+            cmake_extra_arch += ['-DPYTHON_INCLUDE_DIR=' + inc_dir]
+        if (lib_dir != None):
+            cmake_extra_arch += ['-DCMAKE_LIBRARY_PATH=' + lib_dir]
 
         if sys.version_info >= (3, 0):
             cmake_extra_arch += ['-DPYTHON3=yes']
@@ -516,8 +518,6 @@ class build(_build):
         log.info("Detected platform: %s" % sys.platform)
         if sys.platform == "darwin":
             # build on OS X
-            inc_dir = get_python_inc()
-            cmake_extra_arch += ['-DPYTHON_INCLUDE_DIR={inc}'.format(inc=inc_dir)]
 
             # by default, cmake will choose the system python lib in /usr/lib
             # this checks the sysconfig and will correctly pick up a brewed python lib
@@ -530,8 +530,6 @@ class build(_build):
             if platform_arch == '64bit' and  not generator_set:
                 cmake_extra_arch += get_msvc_win64_generator()
 
-            inc_dir = get_python_inc()
-            cmake_extra_arch += ['-DPYTHON_INCLUDE_DIR={inc}'.format(inc=inc_dir)]
             # this imitates cmake in path resolution
             py_ver = get_python_version()
             for ext in [py_ver.replace(".", "") + '.lib', py_ver + 'mu.lib', py_ver + 'm.lib', py_ver + 'u.lib']: