[QGIS Commit] r11551 - in branches/Version-1_0/src: core gui providers/grass python

svn_qgis at osgeo.org svn_qgis at osgeo.org
Fri Sep 4 22:47:14 EDT 2009


Author: kyngchaos
Date: 2009-09-04 22:47:14 -0400 (Fri, 04 Sep 2009)
New Revision: 11551

Modified:
   branches/Version-1_0/src/core/CMakeLists.txt
   branches/Version-1_0/src/gui/CMakeLists.txt
   branches/Version-1_0/src/providers/grass/CMakeLists.txt
   branches/Version-1_0/src/python/CMakeLists.txt
Log:
fix library install names (#768) [from trunk]

Modified: branches/Version-1_0/src/core/CMakeLists.txt
===================================================================
--- branches/Version-1_0/src/core/CMakeLists.txt	2009-09-05 02:43:02 UTC (rev 11550)
+++ branches/Version-1_0/src/core/CMakeLists.txt	2009-09-05 02:47:14 UTC (rev 11551)
@@ -222,6 +222,10 @@
   TARGET_LINK_LIBRARIES(qgis_core ${SQLITE3_LIBRARY})
 ENDIF (NOT WITH_INTERNAL_SQLITE3)
 
+IF (APPLE)
+  SET_TARGET_PROPERTIES(qgis_core PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE )
+ENDIF (APPLE)
+
 INSTALL(TARGETS qgis_core
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
   LIBRARY DESTINATION ${QGIS_LIB_DIR}

Modified: branches/Version-1_0/src/gui/CMakeLists.txt
===================================================================
--- branches/Version-1_0/src/gui/CMakeLists.txt	2009-09-05 02:43:02 UTC (rev 11550)
+++ branches/Version-1_0/src/gui/CMakeLists.txt	2009-09-05 02:47:14 UTC (rev 11551)
@@ -89,6 +89,10 @@
   qgis_core
 )
 
+IF (APPLE)
+  SET_TARGET_PROPERTIES(qgis_gui PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE )
+ENDIF (APPLE)
+
 INSTALL(TARGETS qgis_gui
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
   LIBRARY DESTINATION ${QGIS_LIB_DIR}

Modified: branches/Version-1_0/src/providers/grass/CMakeLists.txt
===================================================================
--- branches/Version-1_0/src/providers/grass/CMakeLists.txt	2009-09-05 02:43:02 UTC (rev 11550)
+++ branches/Version-1_0/src/providers/grass/CMakeLists.txt	2009-09-05 02:47:14 UTC (rev 11551)
@@ -49,6 +49,10 @@
   qgis_core
 )
 
+IF (APPLE)
+  SET_TARGET_PROPERTIES(qgisgrass PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE )
+ENDIF (APPLE)
+
 ADD_LIBRARY (grassprovider MODULE ${GRASS_PROVIDER_SRCS})
 
 IF (WIN32)

Modified: branches/Version-1_0/src/python/CMakeLists.txt
===================================================================
--- branches/Version-1_0/src/python/CMakeLists.txt	2009-09-05 02:43:02 UTC (rev 11550)
+++ branches/Version-1_0/src/python/CMakeLists.txt	2009-09-05 02:47:14 UTC (rev 11551)
@@ -33,6 +33,10 @@
   qgis_core
 )
 
+IF (APPLE)
+  SET_TARGET_PROPERTIES(qgispython PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE )
+ENDIF (APPLE)
+
 INSTALL(TARGETS qgispython
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
   LIBRARY DESTINATION ${QGIS_LIB_DIR})



More information about the QGIS-commit mailing list