ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-05-19 00:30:48 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge 7f753027ef64ef95922f550bab4cf5ccf9b00504 into f57ad036b597383f5bea6fe0872f77f5c5e6e367

Browse Source
This commit is contained in:
lorenz 2019-03-16 18:51:12 +00:00 committed by GitHub
commit 666f586c0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 66 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
CMakeLists.txt
View File

@ -28,20 +28,22 @@ option( ENABLE_CPP_CORE_GUIDELINES_CHECK "Enable cpp core guideline checks on ng
option( USE_SPDLOG "Enable spd log logging" OFF) option( USE_SPDLOG "Enable spd log logging" OFF)
option( DEBUG_LOG "Enable more debug output (may increase computation time) - only works with USE_SPDLOG=ON" OFF) option( DEBUG_LOG "Enable more debug output (may increase computation time) - only works with USE_SPDLOG=ON" OFF)
option( CHECK_RANGE "Check array range access, automatically enabled if built in debug mode" OFF) option( CHECK_RANGE "Check array range access, automatically enabled if built in debug mode" OFF)
option( BUILD_WITH_CONDA "set this to on if the library is compiled with conda-buid" OFF)
option( DYNAMIC_LINK_PYTHON "set this to OFF for static linking to python" ON)
option( USE_SUPERBUILD "use ccache" ON) option( USE_SUPERBUILD "use ccache" ON)
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_modules") set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_modules")
if(APPLE) if(APPLE AND NOT BUILD_WITH_CONDA)
set(INSTALL_DIR_DEFAULT /Applications/Netgen.app) set(INSTALL_DIR_DEFAULT /Applications/Netgen.app)
else(APPLE) else(APPLE AND NOT BUILD_WITH_CONDA)
if(WIN32) if(WIN32)
set(INSTALL_DIR_DEFAULT "C:/netgen") set(INSTALL_DIR_DEFAULT "C:/netgen")
else(WIN32) else(WIN32)
set(INSTALL_DIR_DEFAULT /opt/netgen) set(INSTALL_DIR_DEFAULT /opt/netgen)
endif(WIN32) endif(WIN32)
endif(APPLE) endif(APPLE AND NOT BUILD_WITH_CONDA)
if(INSTALL_DIR) if(INSTALL_DIR)
message(WARNING "INSTALL_DIR is deprecated, use CMAKE_INSTALL_PREFIX instead") message(WARNING "INSTALL_DIR is deprecated, use CMAKE_INSTALL_PREFIX instead")
@ -123,13 +125,18 @@ if(USE_PYTHON)
find_package(PythonInterp 3 REQUIRED) find_package(PythonInterp 3 REQUIRED)
find_package(PythonLibs 3 REQUIRED) find_package(PythonLibs 3 REQUIRED)
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1,0,''))" OUTPUT_VARIABLE PYTHON_PACKAGES_INSTALL_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) if(BUILD_WITH_CONDA)
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())" OUTPUT_VARIABLE PYTHON_PACKAGES_INSTALL_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
else(BUILD_WITH_CONDA)
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1,0,''))" OUTPUT_VARIABLE PYTHON_PACKAGES_INSTALL_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
endif(BUILD_WITH_CONDA)
file(TO_CMAKE_PATH ${PYTHON_PACKAGES_INSTALL_DIR} PYTHON_PACKAGES_INSTALL_DIR) file(TO_CMAKE_PATH ${PYTHON_PACKAGES_INSTALL_DIR} PYTHON_PACKAGES_INSTALL_DIR)
endif(USE_PYTHON) endif(USE_PYTHON)
set(NG_INSTALL_SUFFIX netgen CACHE STRING "Suffix appended to install directories (project name)") set(NG_INSTALL_SUFFIX netgen CACHE STRING "Suffix appended to install directories (project name)")
if(APPLE) if(APPLE AND NOT BUILD_WITH_CONDA)
set(NG_INSTALL_DIR_BIN_DEFAULT Contents/MacOS) set(NG_INSTALL_DIR_BIN_DEFAULT Contents/MacOS)
set(NG_INSTALL_DIR_LIB_DEFAULT Contents/MacOS) set(NG_INSTALL_DIR_LIB_DEFAULT Contents/MacOS)
set(NG_INSTALL_DIR_CMAKE_DEFAULT Contents/Resources/CMake) set(NG_INSTALL_DIR_CMAKE_DEFAULT Contents/Resources/CMake)
@ -138,7 +145,7 @@ if(APPLE)
set(NG_INSTALL_DIR_INCLUDE_DEFAULT Contents/Resources/include) set(NG_INSTALL_DIR_INCLUDE_DEFAULT Contents/Resources/include)
set(NG_RPATH_TOKEN "@loader_path") set(NG_RPATH_TOKEN "@loader_path")
else(APPLE) else(APPLE AND NOT BUILD_WITH_CONDA)
set(NG_INSTALL_DIR_BIN_DEFAULT bin) set(NG_INSTALL_DIR_BIN_DEFAULT bin)
set(NG_INSTALL_DIR_LIB_DEFAULT lib) set(NG_INSTALL_DIR_LIB_DEFAULT lib)
if(WIN32) if(WIN32)
@ -151,7 +158,7 @@ else(APPLE)
set(NG_INSTALL_DIR_INCLUDE_DEFAULT include) set(NG_INSTALL_DIR_INCLUDE_DEFAULT include)
set(NG_RPATH_TOKEN "\$ORIGIN") set(NG_RPATH_TOKEN "\$ORIGIN")
endif(APPLE) endif(APPLE AND NOT BUILD_WITH_CONDA)
set(NG_INSTALL_DIR_PYTHON ${NG_INSTALL_DIR_PYTHON_DEFAULT} CACHE STRING "Install directory for Python files") set(NG_INSTALL_DIR_PYTHON ${NG_INSTALL_DIR_PYTHON_DEFAULT} CACHE STRING "Install directory for Python files")
set(NG_INSTALL_DIR_BIN ${NG_INSTALL_DIR_BIN_DEFAULT} CACHE STRING "Install directory for executables") set(NG_INSTALL_DIR_BIN ${NG_INSTALL_DIR_BIN_DEFAULT} CACHE STRING "Install directory for executables")
@ -267,21 +274,26 @@ endif (USE_GUI)
####################################################################### #######################################################################
if (USE_PYTHON) if (USE_PYTHON)
add_subdirectory(external_dependencies/pybind11)
add_definitions(-DNG_PYTHON) add_definitions(-DNG_PYTHON)
find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h HINTS ${PYTHON_INCLUDE_DIR}) if(BUILD_WITH_CONDA)
if( PYBIND_INCLUDE_DIR ) find_package(pybind11 REQUIRED)
message(STATUS "Found Pybind11: ${PYBIND_INCLUDE_DIR}") set(PYBIND_INCLUDE_DIR PYBIND11_INCLUDE_DIR)
else( PYBIND_INCLUDE_DIR ) else(BUILD_WITH_CONDA)
message(FATAL_ERROR "Could NOT find pybind11!") add_subdirectory(external_dependencies/pybind11)
endif( PYBIND_INCLUDE_DIR ) find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h HINTS ${PYTHON_INCLUDE_DIR})
if( PYBIND_INCLUDE_DIR )
message(STATUS "Found Pybind11: ${PYBIND_INCLUDE_DIR}")
else( PYBIND_INCLUDE_DIR )
message(FATAL_ERROR "Could NOT find pybind11!")
endif( PYBIND_INCLUDE_DIR )
endif(BUILD_WITH_CONDA)
include_directories(${PYBIND_INCLUDE_DIR}) include_directories(${PYBIND_INCLUDE_DIR})
include_directories(${PYTHON_INCLUDE_DIRS}) include_directories(${PYTHON_INCLUDE_DIRS})
if(NG_INSTALL_PYBIND) if(NG_INSTALL_PYBIND)
install(DIRECTORY ${PYBIND_INCLUDE_DIR}/pybind11 DESTINATION ${NG_INSTALL_DIR_INCLUDE} COMPONENT netgen_devel) install(DIRECTORY ${PYBIND_INCLUDE_DIR}/pybind11 DESTINATION ${NG_INSTALL_DIR_INCLUDE} COMPONENT netgen_devel)
install(FILES ${PYBIND_INCLUDE_DIR}/../LICENSE DESTINATION ${NG_INSTALL_DIR_INCLUDE}/pybind11 COMPONENT netgen_devel) install(FILES ${PYBIND_INCLUDE_DIR}/../LICENSE DESTINATION ${NG_INSTALL_DIR_INCLUDE}/pybind11 COMPONENT netgen_devel)
endif(NG_INSTALL_PYBIND) endif(NG_INSTALL_PYBIND)
endif (USE_PYTHON) endif (USE_PYTHON)
@ -428,7 +440,7 @@ if(UNIX)
endif(temp) endif(temp)
endif(UNIX) endif(UNIX)
if(APPLE) if(APPLE AND NOT BUILD_WITH_CONDA)
# create some auxiliary files # create some auxiliary files
set(mac_startup ${CMAKE_CURRENT_BINARY_DIR}/startup.sh) set(mac_startup ${CMAKE_CURRENT_BINARY_DIR}/startup.sh)
file(WRITE ${mac_startup} "\ file(WRITE ${mac_startup} "\
@ -473,7 +485,7 @@ open -a /Applications/Utilities/Terminal.app $Netgen_MACOS/startup.sh
install(FILES ${mac_plist} DESTINATION ${NG_INSTALL_DIR_BIN}/../) install(FILES ${mac_plist} DESTINATION ${NG_INSTALL_DIR_BIN}/../)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/netgen.icns DESTINATION ${NG_INSTALL_DIR_RES}/../ RENAME Netgen.icns) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/netgen.icns DESTINATION ${NG_INSTALL_DIR_RES}/../ RENAME Netgen.icns)
endif(APPLE) endif(APPLE AND NOT BUILD_WITH_CONDA)
if(NOT APPLE) if(NOT APPLE)
include(CPack) include(CPack)

9
libsrc/core/CMakeLists.txt
View File

@ -28,8 +28,9 @@ install(TARGETS ngcore DESTINATION ${NG_INSTALL_DIR} COMPONENT netgen)
if(USE_PYTHON) if(USE_PYTHON)
target_compile_definitions(ngcore PUBLIC NETGEN_PYTHON) target_compile_definitions(ngcore PUBLIC NETGEN_PYTHON)
target_include_directories(ngcore PUBLIC ${PYTHON_INCLUDE_DIRS}) if(DYNAMIC_LINK_PYTHON)
target_link_libraries(ngcore PUBLIC ${PYTHON_LIBRARIES}) target_include_directories(ngcore PUBLIC ${PYTHON_INCLUDE_DIRS})
endif(DYNAMIC_LINK_PYTHON)
endif(USE_PYTHON) endif(USE_PYTHON)
install(FILES ngcore.hpp archive.hpp type_traits.hpp version.hpp ngcore_api.hpp logging.hpp install(FILES ngcore.hpp archive.hpp type_traits.hpp version.hpp ngcore_api.hpp logging.hpp
@ -42,7 +43,9 @@ endif(ENABLE_CPP_CORE_GUIDELINES_CHECK)
if(USE_PYTHON) if(USE_PYTHON)
pybind11_add_module(pyngcore SHARED python_ngcore.cpp) pybind11_add_module(pyngcore SHARED python_ngcore.cpp)
target_link_libraries(pyngcore PUBLIC ngcore ${PYTHON_LIBRARIES}) if(DYNAMIC_LINK_PYTHON)
target_link_libraries(pyngcore PUBLIC ngcore ${PYTHON_LIBRARIES})
endif(DYNAMIC_LINK_PYTHON)
set_target_properties(pyngcore PROPERTIES INSTALL_RPATH "${NG_RPATH_TOKEN}/${NETGEN_PYTHON_RPATH}") set_target_properties(pyngcore PROPERTIES INSTALL_RPATH "${NG_RPATH_TOKEN}/${NETGEN_PYTHON_RPATH}")
install(TARGETS pyngcore DESTINATION ${NG_INSTALL_DIR_PYTHON} COMPONENT netgen) install(TARGETS pyngcore DESTINATION ${NG_INSTALL_DIR_PYTHON} COMPONENT netgen)
endif(USE_PYTHON) endif(USE_PYTHON)

5
libsrc/csg/CMakeLists.txt
View File

@ -11,7 +11,10 @@ if(APPLE)
set_target_properties( csg PROPERTIES SUFFIX ".so") set_target_properties( csg PROPERTIES SUFFIX ".so")
endif(APPLE) endif(APPLE)
target_link_libraries(csg PUBLIC mesh ${PYTHON_LIBRARIES}) target_link_libraries(csg PUBLIC mesh)
if(DYNAMIC_LINK_PYTHON)
target_link_libraries(csg PUBLIC ${PYTHON_LIBRARIES})
endif(DYNAMIC_LINK_PYTHON)
install( TARGETS csg ${NG_INSTALL_DIR}) install( TARGETS csg ${NG_INSTALL_DIR})
target_link_libraries(csg PUBLIC ngcore) target_link_libraries(csg PUBLIC ngcore)

5
libsrc/geom2d/CMakeLists.txt
View File

@ -4,7 +4,10 @@ if(APPLE)
set_target_properties( geom2d PROPERTIES SUFFIX ".so") set_target_properties( geom2d PROPERTIES SUFFIX ".so")
endif(APPLE) endif(APPLE)
target_link_libraries(geom2d mesh ${PYTHON_LIBRARIES}) target_link_libraries(geom2d mesh)
if(DYNAMIC_LINK_PYTHON)
target_link_libraries(geom2d ${PYTHON_LIBRARIES})
endif(DYNAMIC_LINK_PYTHON)
install( TARGETS geom2d ${NG_INSTALL_DIR}) install( TARGETS geom2d ${NG_INSTALL_DIR})
target_link_libraries(geom2d ngcore) target_link_libraries(geom2d ngcore)

5
libsrc/meshing/CMakeLists.txt
View File

@ -22,8 +22,11 @@ if(APPLE)
endif(APPLE) endif(APPLE)
target_link_libraries( mesh PUBLIC ngcore PRIVATE gprim la gen ) target_link_libraries( mesh PUBLIC ngcore PRIVATE gprim la gen )
target_link_libraries( mesh PUBLIC ${ZLIB_LIBRARIES} ${MPI_CXX_LIBRARIES} ${METIS_LIBRARY})
if(DYNAMIC_LINK_PYTHON)
target_link_libraries(mesh PUBLIC ${PYTHON_LIBRARIES})
endif(DYNAMIC_LINK_PYTHON)
target_link_libraries( mesh PUBLIC ${ZLIB_LIBRARIES} ${MPI_CXX_LIBRARIES} ${PYTHON_LIBRARIES} ${METIS_LIBRARY})
install( TARGETS mesh ${NG_INSTALL_DIR}) install( TARGETS mesh ${NG_INSTALL_DIR})
install(FILES install(FILES

5
libsrc/occ/CMakeLists.txt
View File

@ -11,7 +11,10 @@ endif(USE_GUI)
target_link_libraries(occ PUBLIC ngcore) target_link_libraries(occ PUBLIC ngcore)
if(NOT WIN32) if(NOT WIN32)
target_link_libraries( occ PUBLIC ${OCC_LIBRARIES} ${PYTHON_LIBRARIES}) target_link_libraries( occ PUBLIC ${OCC_LIBRARIES})
if(DYNAMIC_LINK_PYTHON)
target_link_libraries(occ PUBLIC ${PYTHON_LIBRARIES})
endif(DYNAMIC_LINK_PYTHON)
install( TARGETS occ ${NG_INSTALL_DIR}) install( TARGETS occ ${NG_INSTALL_DIR})
if (USE_GUI) if (USE_GUI)
target_link_libraries( occvis PUBLIC occ ) target_link_libraries( occvis PUBLIC occ )

5
libsrc/stlgeom/CMakeLists.txt
View File

@ -4,7 +4,10 @@ add_library(stl ${NG_LIB_TYPE}
) )
if(NOT WIN32) if(NOT WIN32)
target_link_libraries( stl mesh ${PYTHON_LIBRARIES}) target_link_libraries( stl mesh )
if(DYNAMIC_LINK_PYTHON)
target_link_libraries( stl ${PYTHON_LIBRARIES})
endif(DYNAMIC_LINK_PYTHON)
install( TARGETS stl ${NG_INSTALL_DIR}) install( TARGETS stl ${NG_INSTALL_DIR})
endif(NOT WIN32) endif(NOT WIN32)

5
libsrc/visualization/CMakeLists.txt
View File

@ -9,7 +9,10 @@ endif(USE_GUI)
add_library(visual ${NG_LIB_TYPE} ${LIB_VISUAL_SOURCES}) add_library(visual ${NG_LIB_TYPE} ${LIB_VISUAL_SOURCES})
target_link_libraries( visual ngcore ${PYTHON_LIBRARIES} ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ) target_link_libraries( visual ngcore ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} )
if(DYNAMIC_LINK_PYTHON)
target_link_libraries( visual ${PYTHON_LIBRARIES})
endif(DYNAMIC_LINK_PYTHON)
install( TARGETS visual ${NG_INSTALL_DIR}) install( TARGETS visual ${NG_INSTALL_DIR})
install(FILES install(FILES

5
ng/CMakeLists.txt
View File

@ -51,7 +51,10 @@ endif(USE_GUI)
if(USE_PYTHON) if(USE_PYTHON)
add_library(ngpy SHARED netgenpy.cpp) add_library(ngpy SHARED netgenpy.cpp)
target_link_libraries( ngpy PUBLIC nglib PRIVATE ${PYTHON_LIBRARIES}) target_link_libraries( ngpy PUBLIC nglib)
if(DYNAMIC_LINK_PYTHON)
target_link_libraries(ngpy PRIVATE ${PYTHON_LIBRARIES})
endif(DYNAMIC_LINK_PYTHON)
if(APPLE) if(APPLE)
set_target_properties( ngpy PROPERTIES SUFFIX ".so") set_target_properties( ngpy PROPERTIES SUFFIX ".so")
elseif(WIN32) elseif(WIN32)

4
nglib/CMakeLists.txt
View File

@ -38,9 +38,9 @@ if(USE_OCC AND NOT WIN32)
target_link_libraries(nglib PUBLIC occ) target_link_libraries(nglib PUBLIC occ)
endif(USE_OCC AND NOT WIN32) endif(USE_OCC AND NOT WIN32)
if(USE_PYTHON) if(USE_PYTHON AND DYNAMIC_LINK_PYTHON)
target_link_libraries(nglib PRIVATE ${PYTHON_LIBRARIES}) target_link_libraries(nglib PRIVATE ${PYTHON_LIBRARIES})
endif(USE_PYTHON) endif(USE_PYTHON AND DYNAMIC_LINK_PYTHON)
install(TARGETS nglib ${NG_INSTALL_DIR}) install(TARGETS nglib ${NG_INSTALL_DIR})
install(FILES nglib.h DESTINATION ${NG_INSTALL_DIR_INCLUDE} COMPONENT netgen_devel) install(FILES nglib.h DESTINATION ${NG_INSTALL_DIR_INCLUDE} COMPONENT netgen_devel)