Merge branch 'fix/zlib-install-mac' into 'master'

Fix/zlib install mac

This MR fixes install paths for OS X when compiling zlib from third party sources. It also removes now unneeded linker flags since CMake handles library dependencies properly.

See merge request !484

cmake/Nektar++Config.cmake.in

@@ -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

@@ -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

cmake/ThirdPartyZlib.cmake

@@ -55,6 +55,12 @@ IF (THIRDPARTY_BUILD_ZLIB)
             ${TPSRC}/zlib-1.2.7
         )
 
+    IF (APPLE)
+        EXTERNALPROJECT_ADD_STEP(zlib-1.2.7 patch-install-path
+            COMMAND ${CMAKE_INSTALL_NAME_TOOL} -id ${CMAKE_INSTALL_PREFIX}/${NEKTAR_LIB_DIR}/libz.1.2.7.dylib ${TPDIST}/lib/libz.1.2.7.dylib
+            DEPENDEES install)
+    ENDIF ()
+
     IF (WIN32)
         SET(ZLIB_LIBRARY zlib CACHE FILEPATH
             "Zlib library" FORCE)