Commit 72c8b0db authored by Michael Turner's avatar Michael Turner
Browse files

get rid of cmake warnings on mac

parent 279c1e79
...@@ -55,15 +55,15 @@ INCLUDE(CMakeParseArguments) ...@@ -55,15 +55,15 @@ INCLUDE(CMakeParseArguments)
ENABLE_TESTING() ENABLE_TESTING()
# Use the CMake 2.4 policy for CMake 2.6 # Use the CMake 2.4 policy for CMake 2.6
IF(COMMAND cmake_policy) #IF(COMMAND cmake_policy)
CMAKE_POLICY(SET CMP0003 OLD) # CMAKE_POLICY(SET CMP0003 OLD)
# Silence warnings when using generator expressions in # Silence warnings when using generator expressions in
# TARGET_LINK_LIBRARIES. # TARGET_LINK_LIBRARIES.
IF(POLICY CMP0022) # IF(POLICY CMP0022)
CMAKE_POLICY(SET CMP0022 NEW) # CMAKE_POLICY(SET CMP0022 NEW)
ENDIF() # ENDIF()
ENDIF(COMMAND cmake_policy) #ENDIF(COMMAND cmake_policy)
# Find the modules included with Nektar # Find the modules included with Nektar
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
...@@ -131,10 +131,10 @@ SET(NEKTAR_LIBRARY_TYPE "SHARED") ...@@ -131,10 +131,10 @@ SET(NEKTAR_LIBRARY_TYPE "SHARED")
SET(CMAKE_SKIP_BUILD_RPATH FALSE) SET(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}") SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
IF (APPLE) #IF (APPLE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) # SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}") # SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
ENDIF() #ENDIF()
LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}" isSystemDir) "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}" isSystemDir)
IF("${isSystemDir}" STREQUAL "-1") IF("${isSystemDir}" STREQUAL "-1")
......
...@@ -384,7 +384,8 @@ TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ...@@ -384,7 +384,8 @@ TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
debug ${ZLIB_LIBRARY_DEBUG} optimized ${ZLIB_LIBRARY_RELEASE} #debug ${ZLIB_LIBRARY_DEBUG} optimized
${ZLIB_LIBRARY_RELEASE}
) )
# TinyXML # TinyXML
......
...@@ -50,7 +50,7 @@ ENDIF() ...@@ -50,7 +50,7 @@ ENDIF()
IF( ${CMAKE_SYSTEM} MATCHES "Darwin-*") IF( ${CMAKE_SYSTEM} MATCHES "Darwin-*")
SET_TARGET_PROPERTIES(Tester SET_TARGET_PROPERTIES(Tester
PROPERTIES LINK_FLAGS "-Wl,-undefined,dynamic_lookup -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -Wl,-rpath,${Boost_LIBRARY_DIRS}") PROPERTIES LINK_FLAGS "-Wl,-undefined,dynamic_lookup -Wl,-rpath,${Boost_LIBRARY_DIRS}")
ENDIF( ${CMAKE_SYSTEM} MATCHES "Darwin-*") ENDIF( ${CMAKE_SYSTEM} MATCHES "Darwin-*")
SET_TARGET_PROPERTIES(Tester SET_TARGET_PROPERTIES(Tester
......
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