Navigation Menu

Skip to content

Commit

Permalink
use install rpath only on apple
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Apr 20, 2012
1 parent 7cdd446 commit 98dbb8e
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 24 deletions.
1 change: 0 additions & 1 deletion debian/rules
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/CMakeLists.txt
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/app/CMakeLists.txt
Expand Up @@ -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})
Expand Down
10 changes: 6 additions & 4 deletions src/browser/CMakeLists.txt
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/core/CMakeLists.txt
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/gui/CMakeLists.txt
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions src/helpviewer/CMakeLists.txt
Expand Up @@ -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)


########################################################
Expand Down
2 changes: 1 addition & 1 deletion src/providers/grass/CMakeLists.txt
Expand Up @@ -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)

#
Expand Down
2 changes: 1 addition & 1 deletion src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
Expand Up @@ -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)

########################################################
Expand Down
2 changes: 1 addition & 1 deletion src/python/CMakeLists.txt
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions tests/bench/CMakeLists.txt
Expand Up @@ -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
Expand Down

0 comments on commit 98dbb8e

Please sign in to comment.