[QGIS Commit] r8279 - in trunk/qgis: . src/app

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-03-25 23:03:44 -0400 (Tue, 25 Mar 2008)
New Revision: 8279

Modified:
   trunk/qgis/CMakeLists.txt
   trunk/qgis/src/app/CMakeLists.txt
Log:
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.


Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2008-03-26 02:47:59 UTC (rev 8278)
+++ trunk/qgis/CMakeLists.txt	2008-03-26 03:03:44 UTC (rev 8279)
@@ -196,6 +196,8 @@
     SET (CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}.app/Contents/MacOS)
     # path for library references
     SET (CMAKE_INSTALL_NAME_DIR @executable_path/lib)
+    #this will define ${APP_SERVICES_LIBRARY}
+    FIND_LIBRARY(APP_SERVICES_LIBRARY ApplicationServices )
   ENDIF (APPLE)
 
   # common for MAC and UNIX

Modified: trunk/qgis/src/app/CMakeLists.txt
===================================================================
--- trunk/qgis/src/app/CMakeLists.txt	2008-03-26 02:47:59 UTC (rev 8278)
+++ trunk/qgis/src/app/CMakeLists.txt	2008-03-26 03:03:44 UTC (rev 8279)
@@ -246,6 +246,10 @@
   TARGET_LINK_LIBRARIES(qgis qtmain)
 ENDIF (MSVC)
 
+IF (APPLE)
+  TARGET_LINK_LIBRARIES(qgis APP_SERVICES_LIBRARY )
+ENDIF (APPLE)
+
 SET_TARGET_PROPERTIES(qgis PROPERTIES
   INSTALL_RPATH ${QGIS_LIB_DIR}
   INSTALL_RPATH_USE_LINK_PATH true