Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
Browse files Browse the repository at this point in the history
  • Loading branch information
volaya committed Oct 27, 2012
2 parents 5c762ef + 779e166 commit 34f677a
Show file tree
Hide file tree
Showing 51 changed files with 6,195 additions and 4,975 deletions.
15 changes: 10 additions & 5 deletions CMakeLists.txt
Expand Up @@ -76,6 +76,7 @@ IF (WITH_BINDINGS)
# as otherwise user has to use PYTHONPATH environemnt variable to add
# QGIS bindings to package search path
SET (BINDINGS_GLOBAL_INSTALL FALSE CACHE BOOL "Install bindings to global python directory? (might need root)")
SET (WITH_PY_COMPILE FALSE CACHE BOOL "Determines whether Python modules in staged or installed locations are byte-compiled")
# concatenate QScintilla2 API files
SET (WITH_QSCIAPI TRUE CACHE BOOL "Determines whether the QScintilla2 API files will be updated and concatenated")
ENDIF (WITH_BINDINGS)
Expand Down Expand Up @@ -626,11 +627,11 @@ IF (APPLE)

# make hard link to embedded app bundle binary (symlink won't work)
# allows QGIS to be run directly from build directory
IF (EXISTS "${CMAKE_BINARY_DIR}/output/bin/QGIS.app/Contents/MacOS/QGIS")
EXECUTE_PROCESS(COMMAND /bin/ln -f
"${CMAKE_BINARY_DIR}/output/bin/QGIS.app/Contents/MacOS/QGIS"
"${CMAKE_BINARY_DIR}/output/bin/QGIS")
ENDIF ()
ADD_CUSTOM_TARGET(mac_hardlink ALL
COMMAND /bin/ln -f QGIS.app/Contents/MacOS/QGIS QGIS
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/output/bin"
DEPENDS QGIS
)
ENDIF (APPLE)

# manual page - makes sense only on unix systems
Expand All @@ -640,6 +641,10 @@ ENDIF (UNIX AND NOT APPLE)

INSTALL(FILES cmake/FindQGIS.cmake DESTINATION ${QGIS_DATA_DIR})

#############################################################
# Post-install commands
ADD_SUBDIRECTORY(postinstall)

#############################################################
# Uninstall stuff see: http://www.vtk.org/Wiki/CMake_FAQ
CONFIGURE_FILE(
Expand Down

0 comments on commit 34f677a

Please sign in to comment.