Merge branch 'master' of github.com:qgis/Quantum-GIS

CMakeLists.txt

@@ -76,6 +76,11 @@ IF (WITH_BINDINGS)
   SET (BINDINGS_GLOBAL_INSTALL FALSE CACHE BOOL "Install bindings to global python directory? (might need root)")
 ENDIF (WITH_BINDINGS)
 
+SET (WITH_GLOBE TRUE CACHE BOOL "Determines whether Globe plugin should be built")
+IF (WITH_GLOBE)
+  FIND_PACKAGE(OSGEARTH)
+ENDIF (WITH_GLOBE)
+
 # Compile flag. Make it possible to turn it off.
 SET (PEDANTIC TRUE CACHE BOOL "Determines if we should compile in pedantic mode.")
 
@@ -269,16 +274,19 @@ ELSE (WIN32)
 
   IF (APPLE)
     # for Mac OS X, everything is put inside an application bundle
+    # save the root install prefix for the app later
+    SET (QGIS_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
     SET (QGIS_MACAPP_PREFIX ${CMAKE_INSTALL_PREFIX}/${QGIS_APP_NAME}.app/Contents)
+    # common prefix for components, let cmake handle it
     SET (CMAKE_INSTALL_PREFIX ${QGIS_MACAPP_PREFIX}/MacOS)
-    # path for library references
-    SET (CMAKE_INSTALL_NAME_DIR @executable_path/lib)
     # 4 bundling levels, each includes previous
     #   0  nothing
     #   1  Qt frameworks
     #   2  non-system libraries, "standard"
     #   3  non-system frameworks, "standalone"
-    SET (QGIS_MACAPP_BUNDLE 0 CACHE STRING "What to bundle into app package")
+    SET (QGIS_MACAPP_BUNDLE 1 CACHE STRING "What to bundle into app package")
+    SET (QGIS_MACAPP_INSTALL_DEV FALSE CACHE BOOL "Install developer frameworks")
+    SET (QGIS_MACAPP_DEV_PREFIX "/Library/Frameworks" CACHE STRING "Path to install developer frameworks")
     # if we have @loader_path, >=OSX 10.5 (darwin 9+)
     IF (CMAKE_SYSTEM_VERSION VERSION_GREATER 9.0.0 OR CMAKE_SYSTEM_VERSION VERSION_EQUAL 9.0.0)
         SET (OSX_HAVE_LOADERPATH 1)
@@ -303,6 +311,8 @@ ELSE (WIN32)
     SET (DEFAULT_PLUGIN_SUBDIR   ../PlugIns/qgis)
     SET (QGIS_PLUGIN_SUBDIR_REV  ../../MacOS)
     SET (DEFAULT_INCLUDE_SUBDIR  include/qgis)
+    # path for framework references
+    SET (CMAKE_INSTALL_NAME_DIR @executable_path/${QGIS_FW_SUBDIR})
 
   ELSE (APPLE)
     # UNIX
@@ -367,12 +377,12 @@ SET (QGIS_PLUGIN_DIR  ${QGIS_PLUGIN_SUBDIR})
 SET (QGIS_INCLUDE_DIR ${QGIS_INCLUDE_SUBDIR})
 
 # manual page - makes sense only on unix systems
-IF (UNIX)
+IF (UNIX AND NOT APPLE)
   SET (DEFAULT_MANUAL_SUBDIR  man)
   SET (QGIS_MANUAL_SUBDIR  ${DEFAULT_MANUAL_SUBDIR}  CACHE STRING "Subdirectory where manual files will be installed")
   MARK_AS_ADVANCED (QGIS_MANUAL_SUBDIR)
   SET (QGIS_MANUAL_DIR  ${CMAKE_INSTALL_PREFIX}/${QGIS_MANUAL_SUBDIR})
-ENDIF (UNIX)
+ENDIF (UNIX AND NOT APPLE)
 
 #############################################################
 # Python bindings
@@ -402,9 +412,9 @@ ENDIF (WITH_BINDINGS)
 
 #############################################################
 # create qgsconfig.h
+# installed with app target
 
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/qgsconfig.h.in ${CMAKE_BINARY_DIR}/qgsconfig.h)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/qgsconfig.h DESTINATION ${QGIS_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 
 # Added by Jef to prevent python core and gui libs linking to other qgisCore and qgisGui libs
@@ -427,18 +437,22 @@ IF (GIT_MARKER)
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       )
     ELSE(MSVC)
+      EXECUTE_PROCESS(COMMAND ${GIT} log -n1 --pretty=%h OUTPUT_VARIABLE REVISION)
+      STRING(STRIP "${REVISION}" REVISION)
       ADD_CUSTOM_COMMAND(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
-        COMMAND echo \\\#define QGSVERSION \\\"$$\( ${GIT} log -n1 --pretty=%h \)\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
+        COMMAND echo \\\#define QGSVERSION \\\"${REVISION}\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
         MAIN_DEPENDENCY ${GIT_MARKER}
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       )
     ENDIF(MSVC)
   ELSE(GIT)
     MESSAGE(STATUS "git marker, but no git found - version will be unknown")
+    SET(REVISION "unknown")
     FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"unknown\"")
   ENDIF(GIT)
 ELSE (GIT_MARKER)
+  SET(REVISION "exported")
   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"exported\"")
 ENDIF (GIT_MARKER)
 

cmake/FindOSGEARTH.cmake

@@ -0,0 +1,101 @@
+# This module defines
+
+# OSGEARTH_LIBRARY
+# OSGEARTH_FOUND, if false, do not try to link to osg
+# OSGEARTH_INCLUDE_DIRS, where to find the headers
+# OSGEARTH_INCLUDE_DIR, where to find the source headers
+# OSGEARTH_GEN_INCLUDE_DIR, where to find the generated headers
+
+# to use this module, set variables to point to the osg build
+# directory, and source directory, respectively
+# OSGEARTHDIR or OSGEARTH_SOURCE_DIR: osg source directory, typically OpenSceneGraph
+# OSGEARTH_DIR or OSGEARTH_BUILD_DIR: osg build directory, place in which you've
+#    built osg via cmake 
+
+# Header files are presumed to be included like
+# #include <osgEarth/Common>
+# #include <osgEarth/TileSource>
+
+###### headers ######
+
+MACRO( FIND_OSGEARTH_INCLUDE THIS_OSGEARTH_INCLUDE_DIR THIS_OSGEARTH_INCLUDE_FILE )
+
+FIND_PATH( ${THIS_OSGEARTH_INCLUDE_DIR} ${THIS_OSGEARTH_INCLUDE_FILE}
+    PATHS
+        ${OSGEARTH_DIR}
+        $ENV{OSGEARTH_SOURCE_DIR}
+        $ENV{OSGEARTHDIR}
+        $ENV{OSGEARTH_DIR}
+        /usr/local/
+        /usr/
+        /sw/ # Fink
+        /opt/local/ # DarwinPorts
+        /opt/csw/ # Blastwave
+        /opt/
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSGEARTH_ROOT]/
+        ~/Library/Frameworks
+        /Library/Frameworks
+    PATH_SUFFIXES
+        /include/
+)
+
+ENDMACRO( FIND_OSGEARTH_INCLUDE THIS_OSGEARTH_INCLUDE_DIR THIS_OSGEARTH_INCLUDE_FILE )
+
+FIND_OSGEARTH_INCLUDE( OSGEARTH_GEN_INCLUDE_DIR   osgEarth/Common )
+FIND_OSGEARTH_INCLUDE( OSGEARTH_INCLUDE_DIR       osgEarth/TileSource )
+
+###### libraries ######
+
+MACRO( FIND_OSGEARTH_LIBRARY MYLIBRARY MYLIBRARYNAME )
+
+FIND_LIBRARY(${MYLIBRARY}
+    NAMES
+        ${MYLIBRARYNAME}
+    PATHS
+        ${OSGEARTH_DIR}
+        $ENV{OSGEARTH_BUILD_DIR}
+        $ENV{OSGEARTH_DIR}
+        $ENV{OSGEARTHDIR}
+        $ENV{OSGEARTH_ROOT}
+        ~/Library/Frameworks
+        /Library/Frameworks
+        /usr/local
+        /usr
+        /sw
+        /opt/local
+        /opt/csw
+        /opt
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSGEARTH_ROOT]/lib
+        /usr/freeware
+    PATH_SUFFIXES
+        /lib/
+        /lib64/
+        /build/lib/
+        /build/lib64/
+        /Build/lib/
+        /Build/lib64/
+     )
+
+ENDMACRO(FIND_OSGEARTH_LIBRARY LIBRARY LIBRARYNAME)
+
+FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY osgEarth )
+FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY_DEBUG osgEarthd)
+
+FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY osgEarthUtil )
+FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY_DEBUG osgEarthUtild)
+
+FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY osgEarthFeatures )
+FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd)
+
+FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY osgEarthSymbology )
+FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY_DEBUG osgEarthSymbologyd )
+
+
+SET( OSGEARTH_FOUND "NO" )
+IF( OSGEARTH_LIBRARY AND OSGEARTH_INCLUDE_DIR )
+    SET( OSGEARTH_FOUND "YES" )
+    SET( OSGEARTH_INCLUDE_DIRS ${OSGEARTH_INCLUDE_DIR} ${OSGEARTH_GEN_INCLUDE_DIR} )
+    GET_FILENAME_COMPONENT( OSGEARTH_LIBRARIES_DIR ${OSGEARTH_LIBRARY} PATH )
+ENDIF( OSGEARTH_LIBRARY AND OSGEARTH_INCLUDE_DIR )
+
+

cmake/FindQGIS.cmake

@@ -1,11 +1,12 @@
-## Once run this will define: 
-## 
+## Once run this will define:
+##
 ## QGIS_FOUND       = system has QGIS lib
 ##
 ## QGIS_CORE_LIBRARY     = full path to the CORE library
 ## QGIS_GUI_LIBRARY      = full path to the GUI library
+## QGIS_ANALYSIS_LIBRARY = full path to the ANALYSIS library
 ## QGIS_PLUGIN_DIR       = full path to where QGIS plugins are installed
-## QGIS_INCLUDE_DIR      = where to find headers 
+## QGIS_INCLUDE_DIR      = where to find headers
 ##
 ## Tim Sutton
 
@@ -19,9 +20,9 @@ IF(WIN32)
         "$ENV{PROGRAMFILES}/Quantum GIS/plugins"
     )
     FIND_PATH(QGIS_INCLUDE_DIR
-      NAMES qgsapplication.h 
+      NAMES qgsapplication.h
       PATHS
-        "$ENV{PROGRAMFILES}/Quantum GIS/include" 
+        "$ENV{PROGRAMFILES}/Quantum GIS/include"
     )
     FIND_LIBRARY(QGIS_CORE_LIBRARY
       NAMES qgis_core
@@ -42,91 +43,117 @@ IF(WIN32)
         "$ENV{OSGEO4W_ROOT}/apps/qgis/plugins"
         "$ENV{PROGRAMFILES}/Quantum GIS/plugins"
     )
-    FIND_PATH(QGIS_INCLUDE_DIR 
-      NAMES qgsapplication.h 
+    FIND_PATH(QGIS_INCLUDE_DIR
+      NAMES qgsapplication.h
       PATHS
-        "$ENV{INCLUDE}" 
-        "$ENV{LIB_DIR}/include/qgis" 
+        "$ENV{INCLUDE}"
+        "$ENV{LIB_DIR}/include/qgis"
         "$ENV{OSGEO4W_ROOT}/include"
         "$ENV{PROGRAMFILES}/Quantum GIS/include"
     )
     FIND_LIBRARY(QGIS_CORE_LIBRARY
       NAMES qgis_core
-      PATHS 
-        "$ENV{LIB_DIR}/lib/" 
-        "$ENV{LIB}" 
+      PATHS
+        "$ENV{LIB_DIR}/lib/"
+        "$ENV{LIB}"
         "$ENV{OSGEO4W_ROOT}/lib"
         "$ENV{PROGRAMFILES}/Quantum GIS/lib"
     )
     FIND_LIBRARY(QGIS_GUI_LIBRARY
       NAMES qgis_gui
-      PATHS 
-        "$ENV{LIB_DIR}" 
-        "$ENV{LIB}" 
+      PATHS
+        "$ENV{LIB_DIR}"
+        "$ENV{LIB}"
+        "$ENV{OSGEO4W_ROOT}/lib"
+        "$ENV{PROGRAMFILES}/Quantum GIS/lib"
+    )
+    FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
+      NAMES qgis_analysis
+      PATHS
+        "$ENV{LIB_DIR}"
+        "$ENV{LIB}"
         "$ENV{OSGEO4W_ROOT}/lib"
         "$ENV{PROGRAMFILES}/Quantum GIS/lib"
     )
   ENDIF (MSVC)
 ELSE(WIN32)
-  IF(UNIX) 
+  IF(UNIX)
     # try to use bundle on mac
+    SET (QGIS_MAC_PATH /Applications/QGIS.app/Contents)
+    #MESSAGE("Searching for QGIS in /usr/bin; /usr/local/bin")
+    FIND_PATH(QGIS_PLUGIN_DIR
+      NAMES libnortharrowplugin.so
+      PATHS
+        /usr/lib64/qgis/plugins
+        /usr/lib/qgis
+        /usr/local/lib/qgis/plugins
+        ${QGIS_MAC_PATH}/PlugIns/qgis
+        "$ENV{LIB_DIR}/lib/qgis/plugins"
+        "$ENV{LIB_DIR}/lib/qgis"
+    )
+    FIND_PATH(QGIS_INCLUDE_DIR
+      NAMES qgis.h
+      PATHS
+        /usr/include/qgis
+        /usr/local/include/qgis
+        ${QGIS_MAC_PATH}/Frameworks/qgis_core.framework/Headers
+        "$ENV{LIB_DIR}/include/qgis"
+    )
+    # also get other frameworks' headers folders on OS X
     IF (APPLE)
-      #MESSAGE("Searching for QGIS in /Applications/QGIS.app/Contents/MacOS")
-      #SET (QGIS_MAC_PATH /Applications/qgis1.0.0.app/Contents/MacOS)
-      SET (QGIS_MAC_PATH /Applications/qgis1.1.0.app/Contents/MacOS)
-      SET (QGIS_LIB_DIR ${QGIS_MAC_PATH}/lib)
-      SET (QGIS_PLUGIN_DIR ${QGIS_MAC_PATH}/lib/qgis CACHE STRING INTERNAL)
-      # set INCLUDE_DIR to prefix+include
-      SET(QGIS_INCLUDE_DIR ${QGIS_MAC_PATH}/include/qgis CACHE STRING INTERNAL)
-      ## extract link dirs 
-      SET(QGIS_CORE_LIBRARY ${QGIS_LIB_DIR}/libqgis_core.dylib CACHE STRING INTERNAL)
-      SET(QGIS_GUI_LIBRARY ${QGIS_LIB_DIR}/libqgis_gui.dylib CACHE STRING INTERNAL)
-    ELSE (APPLE)
-      #MESSAGE("Searching for QGIS in /usr/bin; /usr/local/bin")
-      FIND_PATH(QGIS_PLUGIN_DIR
-        NAMES libnortharrowplugin.so
-        PATHS
-          /usr/lib64/qgis/plugins
-          /usr/lib/qgis
-          /usr/local/lib/qgis/plugins
-          "$ENV{LIB_DIR}/lib/qgis/plugins" 
-          "$ENV{LIB_DIR}/lib/qgis" 
+      FIND_PATH(QGIS_GUI_INCLUDE_DIR
+        NAMES qgisgui.h
+        PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
       )
-      FIND_PATH(QGIS_INCLUDE_DIR
-        NAMES qgis.h 
-        PATHS
-          /usr/include/qgis
-          /usr/local/include/qgis
-          "$ENV{LIB_DIR}/include/qgis" 
+      FIND_PATH(QGIS_ANALYSIS_INCLUDE_DIR
+        NAMES qgsinterpolator.h
+        PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_analysis.framework/Headers
       )
-      FIND_LIBRARY(QGIS_CORE_LIBRARY
-        NAMES qgis_core
-        PATHS 
-          /usr/lib64
-          /usr/lib
-          /usr/local/lib
-          "$ENV{LIB_DIR}/lib/" 
-      )
-      FIND_LIBRARY(QGIS_GUI_LIBRARY
-        NAMES qgis_gui
-        PATHS 
-          /usr/lib64
-          /usr/lib
-          /usr/local/lib
-          "$ENV{LIB_DIR}/lib/" 
+      SET(QGIS_INCLUDE_DIR
+        ${QGIS_INCLUDE_DIR}
+        ${QGIS_GUI_INCLUDE_DIR}
+        ${QGIS_ANALYSIS_INCLUDE_DIR}
       )
     ENDIF (APPLE)
+    FIND_LIBRARY(QGIS_CORE_LIBRARY
+      NAMES qgis_core
+      PATHS
+        /usr/lib64
+        /usr/lib
+        /usr/local/lib
+        ${QGIS_MAC_PATH}/Frameworks
+        "$ENV{LIB_DIR}/lib/"
+    )
+    FIND_LIBRARY(QGIS_GUI_LIBRARY
+      NAMES qgis_gui
+      PATHS
+        /usr/lib64
+        /usr/lib
+        /usr/local/lib
+        ${QGIS_MAC_PATH}/Frameworks
+        "$ENV{LIB_DIR}/lib/"
+    )
+    FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
+      NAMES qgis_analysis
+      PATHS
+        /usr/lib64
+        /usr/lib
+        /usr/local/lib
+        ${QGIS_MAC_PATH}/Frameworks
+        "$ENV{LIB_DIR}/lib/"
+    )
   ENDIF(UNIX)
 ENDIF(WIN32)
 
-IF (QGIS_INCLUDE_DIR AND QGIS_CORE_LIBRARY AND QGIS_GUI_LIBRARY)
+IF (QGIS_INCLUDE_DIR AND QGIS_CORE_LIBRARY AND QGIS_GUI_LIBRARY AND QGIS_ANALYSIS_LIBRARY)
    SET(QGIS_FOUND TRUE)
-ENDIF (QGIS_INCLUDE_DIR AND QGIS_CORE_LIBRARY AND QGIS_GUI_LIBRARY)
+ENDIF ()
 
 IF (QGIS_FOUND)
    IF (NOT QGIS_FIND_QUIETLY)
      MESSAGE(STATUS "Found QGIS core: ${QGIS_CORE_LIBRARY}")
      MESSAGE(STATUS "Found QGIS gui: ${QGIS_GUI_LIBRARY}")
+     MESSAGE(STATUS "Found QGIS analysis: ${QGIS_ANALYSIS_LIBRARY}")
      MESSAGE(STATUS "Found QGIS plugins directory: ${QGIS_PLUGIN_DIR}")
    ENDIF (NOT QGIS_FIND_QUIETLY)
 ELSE (QGIS_FOUND)