Skip to content

Commit

Permalink
Defined application services linkage for mac since we dont just globa…
Browse files Browse the repository at this point in the history
…lly 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
  • Loading branch information
timlinux committed Mar 26, 2008
1 parent b43d659 commit a1008e1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ ELSE (WIN32)
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
Expand Down
4 changes: 4 additions & 0 deletions src/app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,10 @@ IF (MSVC)
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
Expand Down

0 comments on commit a1008e1

Please sign in to comment.