[QGIS Commit] r11550 - in trunk/qgis/src: core gui providers/grass
python
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Sep 4 22:43:03 EDT 2009
Author: kyngchaos
Date: 2009-09-04 22:43:02 -0400 (Fri, 04 Sep 2009)
New Revision: 11550
Modified:
trunk/qgis/src/core/CMakeLists.txt
trunk/qgis/src/gui/CMakeLists.txt
trunk/qgis/src/providers/grass/CMakeLists.txt
trunk/qgis/src/python/CMakeLists.txt
Log:
fix library install names (#768)
Modified: trunk/qgis/src/core/CMakeLists.txt
===================================================================
--- trunk/qgis/src/core/CMakeLists.txt 2009-09-05 01:16:48 UTC (rev 11549)
+++ trunk/qgis/src/core/CMakeLists.txt 2009-09-05 02:43:02 UTC (rev 11550)
@@ -286,6 +286,10 @@
TARGET_LINK_LIBRARIES(qgis_core ${SQLITE3_LIBRARY})
ENDIF (WITH_INTERNAL_SPATIALITE)
+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: trunk/qgis/src/gui/CMakeLists.txt
===================================================================
--- trunk/qgis/src/gui/CMakeLists.txt 2009-09-05 01:16:48 UTC (rev 11549)
+++ trunk/qgis/src/gui/CMakeLists.txt 2009-09-05 02:43:02 UTC (rev 11550)
@@ -90,6 +90,10 @@
TARGET_LINK_LIBRARIES(qgis_gui ${SQLITE3_LIBRARIES})
ENDIF (NOT WITH_INTERNAL_SPATIALITE)
+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: trunk/qgis/src/providers/grass/CMakeLists.txt
===================================================================
--- trunk/qgis/src/providers/grass/CMakeLists.txt 2009-09-05 01:16:48 UTC (rev 11549)
+++ trunk/qgis/src/providers/grass/CMakeLists.txt 2009-09-05 02:43:02 UTC (rev 11550)
@@ -36,6 +36,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: trunk/qgis/src/python/CMakeLists.txt
===================================================================
--- trunk/qgis/src/python/CMakeLists.txt 2009-09-05 01:16:48 UTC (rev 11549)
+++ trunk/qgis/src/python/CMakeLists.txt 2009-09-05 02:43:02 UTC (rev 11550)
@@ -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