Skip to content

Commit a1008e1

Browse files
author
timlinux
committed
Defined application services linkage for mac since we dont just globally link to all qgis libs now (which used to give us ap services libs in the process). Applies to OS X only.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8279 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent b43d659 commit a1008e1

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ ELSE (WIN32)
196196
SET (CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}.app/Contents/MacOS)
197197
# path for library references
198198
SET (CMAKE_INSTALL_NAME_DIR @executable_path/lib)
199+
#this will define ${APP_SERVICES_LIBRARY}
200+
FIND_LIBRARY(APP_SERVICES_LIBRARY ApplicationServices )
199201
ENDIF (APPLE)
200202

201203
# common for MAC and UNIX

src/app/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,10 @@ IF (MSVC)
246246
TARGET_LINK_LIBRARIES(qgis qtmain)
247247
ENDIF (MSVC)
248248

249+
IF (APPLE)
250+
TARGET_LINK_LIBRARIES(qgis APP_SERVICES_LIBRARY )
251+
ENDIF (APPLE)
252+
249253
SET_TARGET_PROPERTIES(qgis PROPERTIES
250254
INSTALL_RPATH ${QGIS_LIB_DIR}
251255
INSTALL_RPATH_USE_LINK_PATH true

0 commit comments

Comments
 (0)