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

Merge 59d073639d80dd743b51d878fdfe7dab3bc5bd78 into 5a66cbee729c6961d6504a19b34719a191853658

Browse Source
This commit is contained in:
StefanBruens 2025-04-08 20:07:07 +02:00 committed by GitHub
commit b4f96cf5ee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -207,7 +207,8 @@ set(NG_INSTALL_DIR EXPORT netgen-targets RUNTIME DESTINATION ${NG_INSTALL_DIR_BI
install(EXPORT netgen-targets DESTINATION ${NG_INSTALL_DIR_CMAKE} COMPONENT netgen_devel) install(EXPORT netgen-targets DESTINATION ${NG_INSTALL_DIR_CMAKE} COMPONENT netgen_devel)
set(CMAKE_MACOSX_RPATH TRUE) set(CMAKE_MACOSX_RPATH TRUE)
set(CMAKE_INSTALL_RPATH "${NG_RPATH_TOKEN};${NG_RPATH_TOKEN}/${NETGEN_RPATH}") # Default RPATH used for all libraries
set(CMAKE_INSTALL_RPATH "${NG_RPATH_TOKEN}")
if(BUILD_FOR_CONDA) if(BUILD_FOR_CONDA)
file(RELATIVE_PATH py_rpath "/bin" "/${NG_INSTALL_DIR_LIB}") file(RELATIVE_PATH py_rpath "/bin" "/${NG_INSTALL_DIR_LIB}")
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${py_rpath}") set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${py_rpath}")

1
ng/CMakeLists.txt
View File

@ -24,6 +24,7 @@ if(USE_GUI)
target_sources(netgen PRIVATE ../windows/netgen.rc) target_sources(netgen PRIVATE ../windows/netgen.rc)
endif(WIN32) endif(WIN32)
target_link_libraries( netgen nglib nggui netgen_python netgen_gui) target_link_libraries( netgen nglib nggui netgen_python netgen_gui)
set_target_properties( netgen PROPERTIES INSTALL_RPATH "${NG_RPATH_TOKEN}/${NETGEN_RPATH}")
install(TARGETS netgen ${NG_INSTALL_DIR}) install(TARGETS netgen ${NG_INSTALL_DIR})
if(APPLE) if(APPLE)
set_target_properties(netgen PROPERTIES OUTPUT_NAME netgen) set_target_properties(netgen PROPERTIES OUTPUT_NAME netgen)