main branch merged rel branch

.gitignore

@@ -1,4 +1,5 @@
 build
+!build/Directory.Build.props
 apps/results
 apps/files
 apps/__pycache__

CMakeLists.txt

@@ -6,9 +6,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if(WIN32)
-    find_package(Python 3.6 COMPONENTS Development REQUIRED)
+    find_package(Python 3.8 COMPONENTS Development EXACT REQUIRED)
 else()
-    find_package(Python 3.7 COMPONENTS Development REQUIRED)
+    find_package(Python 3.8 COMPONENTS Development EXACT REQUIRED)
 endif()
 add_subdirectory(pybind11)
 
@@ -30,7 +30,7 @@ endif()
 
 # include_directories(${CMAKE_SOURCE_DIR}/pybind11/include)
 include_directories(${PYTHON_INCLUDE_PATH})
-find_package(PythonLibs REQUIRED)
+find_package(PythonLibs 3.8 EXACT REQUIRED)
 include_directories(${PYTHON_INCLUDE_PATH})
 include_directories(${PYTHON_INCLUDE_DIRS})
 include_directories(pybind11/include)

setup.py

@@ -37,7 +37,10 @@ def build_extension(self, ext):
             include_path = info['include']
             cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
                           '-DPYTHON_LIBRARY=' + os.path.join(get_config_var('LIBDEST'), '..', 'libs'),
-                          '-DPYTHON_INCLUDE_PATH=' + include_path]
+                          # '-DPYTHON_INCLUDE_PATH=' + include_path,
+                          '-DPYTHON_INCLUDE_PATH=' + os.path.join(get_config_var('LIBDEST'), '..', 'include'),
+                          '-DPYTHON_EXECUTABLE:FILEPATH=' + os.path.join(get_config_var('LIBDEST'), '..'),
+                          '-DPYTHON_EXECUTABLE=' + os.path.join(get_config_var('LIBDEST'), '..', 'python.exe')]
 
             cfg = 'Debug' if self.debug else 'Release'
             build_args = ['--config', cfg]