Skip to content

Commit

Permalink
move getting python external libs
Browse files Browse the repository at this point in the history
  • Loading branch information
gagelarsen authored Sep 18, 2018
1 parent 3203ea4 commit bb4fb70
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,8 @@ if(IS_PYTHON_BUILD)
# that we don't have errors in the python wrapping. We have conda recipes
# for building python packages that target other versions of python.
find_package(PythonLibs ${PYTHON_TARGET_VERSION} EXACT REQUIRED)
list(APPEND EXT_INCLUDE_DIRS
${PYTHON_INCLUDE_DIRS}
)
# Pybind11 module
find_package(pybind11 REQUIRED)
if(IS_CONDA_BUILD)
include("${CONDA_PREFIX}/share/cmake/pybind11/pybind11Targets.cmake")
include("${CONDA_PREFIX}/share/cmake/pybind11/FindPythonLibsNew.cmake")
Expand All @@ -72,8 +70,13 @@ if(IS_PYTHON_BUILD)
include("${CONAN_PYBIND11_ROOT}/share/cmake/pybind11/pybind11ConfigVersion.cmake")
include("${CONAN_PYBIND11_ROOT}/share/cmake/pybind11/pybind11Tools.cmake")
endif()

list(APPEND EXT_INCLUDE_DIRS
${PYTHON_INCLUDE_DIRS}
)
endif()

message("External Lib Includes: ${EXT_INCLUDE_DIRS}")
include_directories(${CMAKE_CURRENT_LIST_DIR})
include_directories(${EXT_INCLUDE_DIRS})
link_directories(${EXT_LIB_DIRS})
Expand Down

0 comments on commit bb4fb70

Please sign in to comment.