Differential D14798 Diff 41907 head/science/py-dlib/files/patch-dlib_cmake__utils_add__python__module
Changeset View
Changeset View
Standalone View
Standalone View
head/science/py-dlib/files/patch-dlib_cmake__utils_add__python__module
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- dlib/cmake_utils/add_python_module.orig 2017-08-28 22:18:45 UTC | |||||
| +++ dlib/cmake_utils/add_python_module | |||||
| @@ -118,12 +118,6 @@ endif() | |||||
| -INCLUDE_DIRECTORIES("${Boost_INCLUDE_DIRS}") | |||||
| -if (PYTHON_INCLUDE_PATH) | |||||
| - INCLUDE_DIRECTORIES("${PYTHON_INCLUDE_PATH}" ) | |||||
| -else() | |||||
| - INCLUDE_DIRECTORIES("${PYTHON_INCLUDE_DIRS}" ) | |||||
| -endif() | |||||
| message(STATUS "USING BOOST_LIBS: ${Boost_LIBRARIES}") | |||||
| if (WIN32) | |||||
| @@ -152,6 +146,14 @@ macro(add_python_module module_name modu | |||||
| ADD_LIBRARY(${module_name}_ SHARED ${module_sources} ${ARGN} ) | |||||
| TARGET_LINK_LIBRARIES(${module_name}_ ${Boost_LIBRARIES} dlib::dlib) | |||||
| + target_include_directories(${module_name}_ SYSTEM PUBLIC "${Boost_INCLUDE_DIRS}") | |||||
| + if (PYTHON_INCLUDE_PATH) | |||||
| + target_include_directories(${module_name}_ SYSTEM PUBLIC "${PYTHON_INCLUDE_PATH}" ) | |||||
| + else() | |||||
| + target_include_directories(${module_name}_ SYSTEM PUBLIC "${PYTHON_INCLUDE_DIRS}" ) | |||||
| + endif() | |||||
| + | |||||
| + | |||||
| if(WIN32 AND NOT CYGWIN) | |||||
| TARGET_LINK_LIBRARIES(${module_name}_ ${PYTHON_LIBRARIES}) | |||||
| SET_TARGET_PROPERTIES( ${module_name}_ | |||||