Skip to content

GitLab

Nektar
Nektar
Commit 6b4157ed authored by David Moxey's avatar David Moxey
Browse files
Options

Fix Darwin issue

parent 37c08182
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 11 deletions
cmake/Nektar++Config.cmake.in
View file @ 6b4157ed
......@@ -107,11 +107,7 @@ ENDIF( NEKTAR_USE_VTK )
INCLUDE(${NEKTAR++_LIBRARY_DIRS}/cmake/Nektar++Libraries.cmake)
# platform dependent options
if(${CMAKE_SYSTEM} MATCHES "Linux.*")
IF(${CMAKE_SYSTEM} MATCHES "Linux.*")
set(NEKTAR++_TP_LIBRARIES ${NEKTAR++_TP_LIBRARIES} rt)
SET(NEKTAR++_DEFINITIONS "${NEKTAR++_DEFINITIONS} -pthread")
endif(${CMAKE_SYSTEM} MATCHES "Linux.*")
if(${CMAKE_SYSTEM} MATCHES "Darwin-*")
SET(NEKTAR++_DEFINITIONS "${NEKTAR++_DEFINITIONS} -Wl,-undefined,dynamic_lookup -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -Wl,-rpath,${Boost_LIBRARY_DIRS}")
endif(${CMAKE_SYSTEM} MATCHES "Darwin-*")
ENDIF(${CMAKE_SYSTEM} MATCHES "Linux.*")
cmake/NektarCommon.cmake
View file @ 6b4157ed
......@@ -123,11 +123,6 @@ MACRO(ADD_NEKTAR_EXECUTABLE name component sources)
ENDIF( ${CMAKE_SYSTEM} MATCHES "Linux.*" )
IF( ${CMAKE_SYSTEM} MATCHES "Darwin-*")
SET_TARGET_PROPERTIES(${name}
PROPERTIES LINK_FLAGS "-Wl,-undefined,dynamic_lookup -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -Wl,-rpath,${Boost_LIBRARY_DIRS}")
ENDIF( ${CMAKE_SYSTEM} MATCHES "Darwin-*")
SET_PROPERTY(TARGET ${name} PROPERTY FOLDER ${component})
INSTALL(TARGETS ${name}
RUNTIME DESTINATION ${NEKTAR_BIN_DIR} COMPONENT ${component} OPTIONAL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment