electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Python integration to build with vcpkg

Browse Source 
* Add vcpkg support to find Oython using CMake
* Fix pid_t conflict with python
* Fix COMPILER conflict with python
This commit is contained in:
Mark Roszko
2020-09-22 12:39:05 +00:00
committed by Ian McInerney
parent 00058f79d1
commit 7656663a2f
4 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeModules/FindPythonInterp.cmake
+2
View File
@@ -107,6 +107,8 @@ if(NOT PYTHON_EXECUTABLE)
list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.2" )
list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.1" )
list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.0" )
elseif(VCPKG_TOOLCHAIN)
list( APPEND _Python_PPATHS ${PYTHON_ROOT_DIR} )
else()
list( APPEND _Python_PPATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath] )
endif()