sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-18 00:06:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

always search /Library/Frameworks for linking on OS X in case SDK won't

Browse Source
This commit is contained in:
William Kyngesburye 2013-04-01 16:24:57 -05:00
parent d232360ff7
commit 00c5edf217
7 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -440,6 +440,13 @@ ELSE (WIN32)
IF (WITH_GLOBE) IF (WITH_GLOBE)
SET (OSG_PLUGINS_PATH "" CACHE PATH "Path to OSG plugins for bundling") SET (OSG_PLUGINS_PATH "" CACHE PATH "Path to OSG plugins for bundling")
ENDIF (WITH_GLOBE) ENDIF (WITH_GLOBE)
# recent cmakes force SDKs, recent SDKs don't have user symlinks
# need to find non-system frameworks
# cmake bug #0007250 - CMAKE_SHARED_LINKER_FLAGS ignored when creating
# a framework, so these need to be manually handled with LINK_FLAGS options
SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -F/Library/Frameworks")
SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -F/Library/Frameworks")
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -F/Library/Frameworks")
ELSE (APPLE) ELSE (APPLE)
# UNIX # UNIX

1
src/analysis/CMakeLists.txt
View File

@ -155,6 +155,7 @@ ELSE(NOT APPLE)
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_analysis MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_analysis
BUILD_WITH_INSTALL_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE
PUBLIC_HEADER "${QGIS_ANALYSIS_HDRS}" PUBLIC_HEADER "${QGIS_ANALYSIS_HDRS}"
LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}"
) )
ENDIF(NOT APPLE) ENDIF(NOT APPLE)

1
src/analysis/network/CMakeLists.txt
View File

@ -56,6 +56,7 @@ ELSE(NOT APPLE)
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_networkanalysis MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_networkanalysis
BUILD_WITH_INSTALL_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE
PUBLIC_HEADER "${QGIS_NETWORK_ANALYSIS_HDRS};${QGIS_NETWORK_ANALYSIS_MOC_HDRS}" PUBLIC_HEADER "${QGIS_NETWORK_ANALYSIS_HDRS};${QGIS_NETWORK_ANALYSIS_MOC_HDRS}"
LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}"
) )
ENDIF(NOT APPLE) ENDIF(NOT APPLE)

1
src/core/CMakeLists.txt
View File

@ -592,6 +592,7 @@ ELSE(NOT APPLE)
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_core MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_core
BUILD_WITH_INSTALL_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE
PUBLIC_HEADER "${QGIS_CORE_HDRS};${QGIS_CORE_MOC_HDRS}" PUBLIC_HEADER "${QGIS_CORE_HDRS};${QGIS_CORE_MOC_HDRS}"
LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}"
) )
ENDIF(NOT APPLE) ENDIF(NOT APPLE)

1
src/gui/CMakeLists.txt
View File

@ -378,6 +378,7 @@ ELSE(NOT APPLE)
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_gui MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_gui
BUILD_WITH_INSTALL_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE
PUBLIC_HEADER "${QGIS_GUI_HDRS};${QGIS_GUI_MOC_HDRS}" PUBLIC_HEADER "${QGIS_GUI_HDRS};${QGIS_GUI_MOC_HDRS}"
LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}"
) )
ENDIF(NOT APPLE) ENDIF(NOT APPLE)

6
src/providers/grass/CMakeLists.txt
View File

@ -29,6 +29,12 @@ SET_TARGET_PROPERTIES(qgisgrass PROPERTIES
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_grass MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_grass
COMPILE_FLAGS "\"-DGRASS_LIB_EXPORT=${DLLEXPORT}\" \"-DGRASS_EXPORT=${DLLIMPORT}\"" ) COMPILE_FLAGS "\"-DGRASS_LIB_EXPORT=${DLLEXPORT}\" \"-DGRASS_EXPORT=${DLLIMPORT}\"" )
IF (APPLE)
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES
LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}"
)
ENDIF (APPLE)
#generate unversioned libs for android #generate unversioned libs for android
IF (NOT ANDROID) IF (NOT ANDROID)
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES SET_TARGET_PROPERTIES(qgisgrass PROPERTIES

6
src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
View File

@ -35,6 +35,12 @@ SET_TARGET_PROPERTIES(qgissqlanyconnection PROPERTIES
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION} MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_sqlanyconnection) MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_sqlanyconnection)
IF (APPLE)
SET_TARGET_PROPERTIES(qgissqlanyconnection PROPERTIES
LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}"
)
ENDIF (APPLE)
#generate unversioned libs for android #generate unversioned libs for android
IF (NOT ANDROID) IF (NOT ANDROID)
SET_TARGET_PROPERTIES(qgissqlanyconnection PROPERTIES SET_TARGET_PROPERTIES(qgissqlanyconnection PROPERTIES