haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorder pybind11 to be after we find the interp and libs ourselves 

Our python find module is patched for vcpkg and we want it to execute first.
This commit is contained in:
Marek Roszko 2022-05-02 00:43:34 -04:00
parent 9dd8bc1060
commit b21f37e22f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -779,12 +779,6 @@ set( INC_AFTER
find_package( SWIG 3.0 REQUIRED ) find_package( SWIG 3.0 REQUIRED )
include( ${SWIG_USE_FILE} ) include( ${SWIG_USE_FILE} )
# pybind11 is header-only, so include the subdir
add_subdirectory(thirdparty/pybind11)
# Make sure that we get our pybind11 and not the system pybind11 (ours is patched to work with wx)
include_directories( BEFORE SYSTEM ${PYBIND11_INCLUDE_DIR} )
set( PythonInterp_FIND_VERSION 3.6 ) set( PythonInterp_FIND_VERSION 3.6 )
set( PythonLibs_FIND_VERSION 3.6 ) set( PythonLibs_FIND_VERSION 3.6 )
@ -826,6 +820,12 @@ message( STATUS "Python module install path: ${PYTHON_DEST}" )
find_package( PythonLibs 3.6 REQUIRED ) find_package( PythonLibs 3.6 REQUIRED )
# pybind11 is header-only, so include the subdir
add_subdirectory(thirdparty/pybind11)
# Make sure that we get our pybind11 and not the system pybind11 (ours is patched to work with wx)
include_directories( BEFORE SYSTEM ${PYBIND11_INCLUDE_DIR} )
# Infrequently needed headers go at end of search paths, append to INC_AFTER which # Infrequently needed headers go at end of search paths, append to INC_AFTER which
# although is used for all components, should be a harmless hit for something like eeschema # although is used for all components, should be a harmless hit for something like eeschema
# so long as unused search paths are at the end like this. # so long as unused search paths are at the end like this.