use install rpath only on apple

qgis · Apr 20, 2012 · 98dbb8e · 98dbb8e
1 parent 7cdd446
commit 98dbb8e
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 24 deletions.
diff --git a/debian/rules b/debian/rules
@@ -30,7 +30,6 @@ CMAKE_OPTS := \
 	-D BUILDNAME=$(DEB_BUILD_NAME) \
 	-D GRASS_PREFIX=/usr/lib/grass64 \
 	-D CMAKE_INSTALL_PREFIX=/usr \
-	-D CMAKE_SKIP_RPATH=TRUE \
 	-D BINDINGS_GLOBAL_INSTALL=TRUE \
 	-D PEDANTIC=TRUE \
 	-D WITH_SPATIALITE=TRUE \

diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -127,7 +127,7 @@ TARGET_LINK_LIBRARIES(qgis_analysis
 )
 
 IF (APPLE)
-  SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE )
+  SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
 ENDIF (APPLE)
 
 # install

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -463,12 +463,12 @@ ENDIF(NOT WITH_INTERNAL_SPATIALITE)
 
 IF (APPLE)
   TARGET_LINK_LIBRARIES(${QGIS_APP_NAME} ${APP_SERVICES_LIBRARY} )
-ENDIF (APPLE)
 
-SET_TARGET_PROPERTIES(${QGIS_APP_NAME} PROPERTIES
-  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_DIR}
-  INSTALL_RPATH_USE_LINK_PATH true
-  MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/app.info.plist.in")
+  SET_TARGET_PROPERTIES(${QGIS_APP_NAME} PROPERTIES
+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_DIR}
+    INSTALL_RPATH_USE_LINK_PATH true
+    MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/app.info.plist.in")
+ENDIF(APPLE)
 
 IF (POSTGRES_FOUND)
   TARGET_LINK_LIBRARIES (${QGIS_APP_NAME} ${POSTGRES_LIBRARY})

diff --git a/src/browser/CMakeLists.txt b/src/browser/CMakeLists.txt
@@ -86,10 +86,12 @@ TARGET_LINK_LIBRARIES(qbrowser
   ${QT_QTMAIN_LIBRARY}
 )
 
-SET_TARGET_PROPERTIES(qbrowser PROPERTIES
-  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_DIR}
-  INSTALL_RPATH_USE_LINK_PATH true
-)
+IF(APPLE)
+  SET_TARGET_PROPERTIES(qbrowser PROPERTIES
+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_DIR}
+    INSTALL_RPATH_USE_LINK_PATH true
+  )
+ENDIF(APPLE)
 
 ########################################################
 # Install

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -581,7 +581,7 @@ IF (HAVE_ZLIB)
 ENDIF (HAVE_ZLIB)
 
 IF (APPLE)
-  SET_TARGET_PROPERTIES(qgis_core PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE )
+  SET_TARGET_PROPERTIES(qgis_core PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
 ENDIF (APPLE)
 
 # install

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -308,7 +308,7 @@ IF (NOT WITH_INTERNAL_SPATIALITE)
 ENDIF (NOT WITH_INTERNAL_SPATIALITE)
 
 IF (APPLE)
-  SET_TARGET_PROPERTIES(qgis_gui PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE )
+  SET_TARGET_PROPERTIES(qgis_gui PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
 ENDIF (APPLE)
 
 # install

diff --git a/src/helpviewer/CMakeLists.txt b/src/helpviewer/CMakeLists.txt
@@ -85,10 +85,12 @@ TARGET_LINK_LIBRARIES(qgis_help
   ${QT_QTMAIN_LIBRARY}
   )
 
-SET_TARGET_PROPERTIES(qgis_help PROPERTIES
-  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_DIR}
-  INSTALL_RPATH_USE_LINK_PATH true
-)
+IF(APPLE)
+  SET_TARGET_PROPERTIES(qgis_help PROPERTIES
+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_DIR}
+    INSTALL_RPATH_USE_LINK_PATH true
+  )
+ENDIF(APPLE)
 
 
 ########################################################

diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
@@ -46,7 +46,7 @@ TARGET_LINK_LIBRARIES(qgisgrass
 )
 
 IF (APPLE)
-  SET_TARGET_PROPERTIES(qgisgrass PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE )
+  SET_TARGET_PROPERTIES(qgisgrass PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
 ENDIF (APPLE)
 
 #

diff --git a/src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt b/src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
@@ -52,7 +52,7 @@ IF(UNIX AND NOT ANDROID)
 ENDIF(UNIX AND NOT ANDROID)
 
 IF (APPLE)
-  SET_TARGET_PROPERTIES(qgissqlanyconnection PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE )
+  SET_TARGET_PROPERTIES(qgissqlanyconnection PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
 ENDIF (APPLE)
 
 ########################################################

diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
@@ -40,7 +40,7 @@ TARGET_LINK_LIBRARIES(qgispython
 )
 
 IF (APPLE)
-  SET_TARGET_PROPERTIES(qgispython PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE )
+  SET_TARGET_PROPERTIES(qgispython PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
 ENDIF (APPLE)
 
 INSTALL(TARGETS qgispython

diff --git a/tests/bench/CMakeLists.txt b/tests/bench/CMakeLists.txt
@@ -46,10 +46,12 @@ TARGET_LINK_LIBRARIES(qgis_bench
   ${QT_QTTEST_LIBRARY}
 )
 
-SET_TARGET_PROPERTIES(qgis_bench PROPERTIES
-  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_DIR}
-  INSTALL_RPATH_USE_LINK_PATH true
-)
+IF(APPLE)
+  SET_TARGET_PROPERTIES(qgis_bench PROPERTIES
+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_DIR}
+    INSTALL_RPATH_USE_LINK_PATH true
+  )
+ENDIF(APPLE)
 
 ########################################################
 # Install