|
 |
fb55647 |
diff -rupN --no-dereference netgen-6.2.2101/cmake/SuperBuild.cmake netgen-6.2.2101-new/cmake/SuperBuild.cmake
|
|
|
fb55647 |
--- netgen-6.2.2101/cmake/SuperBuild.cmake 2021-01-15 15:50:18.000000000 +0100
|
|
|
fb55647 |
+++ netgen-6.2.2101-new/cmake/SuperBuild.cmake 2021-01-24 22:34:32.660549160 +0100
|
|
|
bf9749a |
@@ -38,7 +38,7 @@ endif(NOT WIN32)
|
|
|
f179299 |
|
|
|
f179299 |
#######################################################################
|
|
|
f179299 |
if (USE_PYTHON)
|
|
|
f179299 |
- find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h PATHS ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies/pybind11/include NO_DEFAULT_PATH)
|
|
|
f179299 |
+ find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h PATHS ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies/pybind11/include)
|
|
|
f179299 |
set(NG_INSTALL_PYBIND ON)
|
|
|
f179299 |
if( NOT PYBIND_INCLUDE_DIR )
|
|
|
f179299 |
# if the pybind submodule is missing, try to initialize and update all submodules
|
|
|
fb55647 |
diff -rupN --no-dereference netgen-6.2.2101/CMakeLists.txt netgen-6.2.2101-new/CMakeLists.txt
|
|
|
fb55647 |
--- netgen-6.2.2101/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100
|
|
|
fb55647 |
+++ netgen-6.2.2101-new/CMakeLists.txt 2021-01-24 22:34:32.660549160 +0100
|
|
|
fb55647 |
@@ -268,7 +268,7 @@ else()
|
|
|
d1ea64b |
endif()
|
|
|
d1ea64b |
|
|
|
d1ea64b |
if (USE_PYTHON)
|
|
|
d1ea64b |
- add_subdirectory(external_dependencies/pybind11)
|
|
|
d1ea64b |
+ include(cmake/pybind11Tools.cmake)
|
|
|
d1ea64b |
find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h HINTS ${PYTHON_INCLUDE_DIR})
|
|
|
d1ea64b |
if( PYBIND_INCLUDE_DIR )
|
|
|
d1ea64b |
message(STATUS "Found Pybind11: ${PYBIND_INCLUDE_DIR}")
|
|
|
fb55647 |
@@ -282,10 +282,6 @@ if (USE_PYTHON)
|
|
|
d1ea64b |
target_link_libraries(netgen_python INTERFACE ${PYTHON_LIBRARIES})
|
|
|
d1ea64b |
endif()
|
|
|
f179299 |
|
|
|
f179299 |
- if(NG_INSTALL_PYBIND)
|
|
|
f179299 |
- install(DIRECTORY ${PYBIND_INCLUDE_DIR}/pybind11 DESTINATION ${NG_INSTALL_DIR_INCLUDE} COMPONENT netgen_devel)
|
|
|
f179299 |
- install(FILES ${PYBIND_INCLUDE_DIR}/../LICENSE DESTINATION ${NG_INSTALL_DIR_INCLUDE}/pybind11 COMPONENT netgen_devel)
|
|
|
f179299 |
- endif(NG_INSTALL_PYBIND)
|
|
|
f179299 |
endif (USE_PYTHON)
|
|
|
f179299 |
|
|
|
f179299 |
#######################################################################
|