Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
MMFSolver
Nektar
Commits
6b4157ed
Commit
6b4157ed
authored
Jul 16, 2015
by
David Moxey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Darwin issue
parent
37c08182
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
11 deletions
+2
-11
cmake/Nektar++Config.cmake.in
cmake/Nektar++Config.cmake.in
+2
-6
cmake/NektarCommon.cmake
cmake/NektarCommon.cmake
+0
-5
No files found.
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment