Commit cf251710 authored by Chris Cantwell's avatar Chris Cantwell

Attempt to fix for older versions of CMake still used in supported OSs.

parent 431f2dd9
......@@ -47,6 +47,8 @@ IF( NEKTAR_USE_MPI )
UNSET(HAVE_APRUN CACHE)
ENDIF()
ADD_DEFINITIONS(-DNEKTAR_USE_MPI)
IF (THIRDPARTY_BUILD_GSMPI)
EXTERNALPROJECT_ADD(
gsmpi-1.2
......
......@@ -411,7 +411,6 @@ ENDIF()
# MPI
IF( NEKTAR_USE_MPI )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PRIVATE ${GSMPI_LIBRARY} ${XXT_LIBRARY})
TARGET_COMPILE_DEFINITIONS(LibUtilities PUBLIC "-DNEKTAR_USE_MPI")
IF (NOT MPI_BUILTIN)
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARY})
SET_TARGET_PROPERTIES(LibUtilities
......
......@@ -53,6 +53,9 @@ IF( ${CMAKE_SYSTEM} MATCHES "Darwin-*")
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_TARGET_PROPERTIES(Tester
PROPERTIES COMPILE_FLAGS "-UNEKTAR_USE_MPI")
INSTALL(TARGETS Tester
RUNTIME DESTINATION ${NEKTAR_BIN_DIR} COMPONENT test OPTIONAL
ARCHIVE DESTINATION ${NEKTAR_LIB_DIR} COMPONENT test 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