Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/.travis.yml
+++ b/.travis.yml
 env:
  global:
+  - OSGEARTH_CACHE_PATH=/tmp
  # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
  #   via the "travis encrypt" command using the project repo's public key
  - secure: "vLe6I4mS64oabuhMJ5NHyJLJHxudgErRoKpoXZP9/8A6rx/TmZ/gYCmtENmKublSIyOmjoVoZ8lvw10a1zCgnlQEjdijxwPvO1IN4XlesjhbxFRysmYAQZsFifZ91ta/0Ajw6NV6ofhmWCBRUc2yCEexnf+xvj80+v6tq2q3YFIL0shHjm7c3Z5nOuKPTsxLEAtHYurUM3ao4gcppc5lOeOT+r+ENE0MCQwSKOXiXh4BWCkP9cQvKel8ineBl3T6qRrT0OQQ/OBeSba/orVrf6Y3Ls+BYM48NjxG0TN2PIP68eJVQnvPNZ+j42MypkrFckcJDM/N/1pI6ZiY0PrzPMX3SisP5WDKimowWuyaI/pdOO2tBqPIIdZvuAoUyh5MYBBHLGeHf4jCD+YwY2JcOdStHgkp4NE2JqjXvP9V4TizFjrZ1jb+MXHwVKF4mleo6Eoq+qOdj8Y9iFhwmpuf9oGgoEIWR4uxgrGwiSRVVQ4o5uouP1MENvqaFB5JMTep/PSAWNLw18sgza3NiEhardI73bvl/xEvJssdeoGzpRl6YAo+sprZ93wsuzSh2beils8f1CjKQsuoDIASYre93qGEdUXRnhQvF8wmlYnQLJamYEMN37yduzZ2OHuA7+1kkMSTjPZAIoEsuyOG+25eHXnPQBECe6iqWFuKVgzdero="

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,9 @@ if(COMMAND cmake_policy)
    # Qt5 qt5_use_modules usage was causing "Policy CMP0043 is not set: Ignore COMPILE_DEFINITIONS_<Config> properties." warnings
    cmake_policy(SET CMP0043 NEW)

+    # Double colon in target name means IMPORTED (and not ALIAS or IMPORTED).
+    # Fixes a warning when cache_rocksdb links to target "RocksDB::rocksdb"
+    cmake_policy(SET CMP0028 NEW)
 endif(COMMAND cmake_policy)

 #
@@ -50,6 +53,12 @@ SET(OpenThreads_SOURCE_DIR ${OSGEARTH_SOURCE_DIR})
 # Good place to look for the OSG 3rd party libs
 SET(THIRD_PARTY_DIR "" CACHE PATH "OSG 3rd-party dependency folder")

+IF(THIRD_PARTY_DIR)
+    LIST(APPEND CMAKE_INCLUDE_PATH ${THIRD_PARTY_DIR}/include)
+    LIST(APPEND CMAKE_LIBRARY_PATH ${THIRD_PARTY_DIR}/lib)
+    MESSAGE(STATUS "CMAKE_INCLUDE_PATH=${CMAKE_INCLUDE_PATH}")
+ENDIF(THIRD_PARTY_DIR)
+
 # We have some custom .cmake scripts not in the official distribution.
 # Maybe this can be used override existing behavior if needed?
 SET(CMAKE_MODULE_PATH "${OSGEARTH_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
@@ -66,22 +75,34 @@ SET(OSGEARTH_USE_GLES FALSE)

 # check for iOS build
 OPTION(OSGEARTH_BUILD_PLATFORM_IPHONE "Enable IPhoneSDK Device support" OFF)
-OPTION(OSGEARTH_BUILD_PLATFORM_IPHONE_SIMULATOR "Enable IPhoneSDK Simulator support" OFF)

-IF(OSGEARTH_BUILD_PLATFORM_IPHONE OR OSGEARTH_BUILD_PLATFORM_IPHONE_SIMULATOR)
+IF(OSGEARTH_BUILD_PLATFORM_IPHONE)
+
    SET(OSGEARTH_USE_GLES TRUE)
-    #you need to manually set the default sdk version here
-    SET (IPHONE_SDKVER "10.2" CACHE STRING "iOS SDK-Version")
-    SET (IPHONE_VERSION_MIN "8.0" CACHE STRING "IOS minimum os version, use 7.0 or greater to get 64bit support")
-    SET (IPHONE_PLATFORMSROOT "/Applications/Xcode.app/Contents/Developer/Platforms")

-    IF(OSGEARTH_BUILD_PLATFORM_IPHONE)
-        SET(CMAKE_OSX_SYSROOT "${IPHONE_PLATFORMSROOT}/iPhoneOS.platform/Developer/SDKs/iPhoneOS${IPHONE_SDKVER}.sdk" CACHE STRING "System root for iOS" FORCE)
-        SET(CMAKE_OSX_ARCHITECTURES "armv7;armv7s;arm64" CACHE STRING "Build architectures for iOS" FORCE)
-    ELSE()
-        SET(CMAKE_OSX_SYSROOT "${IPHONE_PLATFORMSROOT}/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_SDKVER}.sdk" CACHE STRING "System root for iOS" FORCE)
-        SET(CMAKE_OSX_ARCHITECTURES "i386" CACHE STRING "Build architectures for iOS Simulator" FORCE)
-    ENDIF()
+    # set sdk and min versions
+    SET (IPHONE_SDKVER "10.2" CACHE STRING "IOS SDK-Version")
+    SET (IPHONE_VERSION_MIN "7.0" CACHE STRING "IOS minimum os version, use 7.0 or greater to get 64bit support")
+
+    # get full path to sdk from requested versions
+    SET (IPHONE_DEVROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer")
+    SET (IPHONE_SDKROOT "${IPHONE_DEVROOT}/SDKs/iPhoneOS${IPHONE_SDKVER}.sdk")
+
+    # optionally enable bitcode for the build
+    SET (IPHONE_ENABLE_BITCODE "NO" CACHE STRING "IOS Enable Bitcode")
+
+    # seamless toggle between device and simulator
+    SET(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos;-iphonesimulator")
+
+    # set deployment target to min version
+    SET(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${IPHONE_VERSION_MIN}" CACHE STRING "Deployment target for iOS" FORCE)
+
+    # Set standard architectures
+    SET(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD)")
+
+    # set the sdk path as our sysroot
+    SET(CMAKE_OSX_SYSROOT "${IPHONE_SDKROOT}" CACHE STRING "System root for iOS" FORCE)
+
 ENDIF ()


@@ -119,16 +140,30 @@ FIND_PACKAGE(CURL)
 FIND_PACKAGE(GDAL)
 FIND_PACKAGE(GEOS)
 FIND_PACKAGE(Sqlite3)
-FIND_PACKAGE(ZLIB)
 FIND_PACKAGE(Poco)

 FIND_PACKAGE(LevelDB)
+
+SET (WITH_STATIC_ROCKSDB FALSE CACHE BOOL "Use static library of RocksDB")
+
+IF(MINGW)
+    FIND_PACKAGE(RocksDB CONFIG)
+    IF(RocksDB_FOUND)
+        MESSAGE(STATUS "Found RocksDB " ${RocksDB_VERSION})
+    ENDIF()
+ELSE(MINGW)
+    IF (WITH_STATIC_ROCKSDB)
+      FIND_PACKAGE(RocksDB REQUIRED COMPONENTS STATIC)
+    ELSE()
      FIND_PACKAGE(RocksDB)
+    ENDIF()
+ENDIF(MINGW)

 FIND_PACKAGE(SilverLining QUIET)
 FIND_PACKAGE(Triton QUIET)

-FIND_PACKAGE(PROTOBUF QUIET)
+FIND_PACKAGE(Protobuf QUIET)
+SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compiled as dll")

 SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape")
 IF (WITH_EXTERNAL_DUKTAPE)
@@ -143,60 +178,19 @@ IF (WITH_EXTERNAL_TINYXML)
    FIND_PACKAGE(TinyXML)
 ENDIF (WITH_EXTERNAL_TINYXML)

-IF(UNIX)
+IF(UNIX AND NOT ANDROID)
    # Not sure what this will do on Cygwin and Msys
    # Also, remember OS X X11 is a user installed option so it may not exist.
    FIND_PACKAGE(X11)
    # Some Unicies need explicit linkage to the Math library or the build fails.
    FIND_LIBRARY(MATH_LIBRARY m)
-ENDIF(UNIX)
-
-
-OPTION(OSGEARTH_QT_BUILD "Enable to use Qt (build Qt-dependent libraries, plugins and examples)" OFF)
-OPTION(OSGEARTH_QT_BUILD_LEGACY_WIDGETS "Build the legacy Qt widgets" OFF)
-set(OSGEARTH_QT_VERSION 5 CACHE STRING "Qt version to use")
-
-IF(OSGEARTH_QT_BUILD)
-  # To select a specific version of QT define DESIRED_QT_VERSION
-  # via cmake -DDESIRED_QT_VERSION=5
-  # QUIET option disables messages if the package cannot be found.
-  IF  (OSGEARTH_QT_VERSION)
-      IF  (OSGEARTH_QT_VERSION MATCHES "5")
-          FIND_PACKAGE(Qt5Widgets REQUIRED)
-      ELSEIF (OSGEARTH_QT_VERSION MATCHES "4")
-          FIND_PACKAGE(Qt4 REQUIRED)
-      ENDIF()
-  ELSE()
-      FIND_PACKAGE(Qt5Widgets QUIET)
-      IF ( NOT Qt5Widgets_FOUND )
-          FIND_PACKAGE(Qt4 REQUIRED)
-      ENDIF()
-  ENDIF()
-ENDIF(OSGEARTH_QT_BUILD)
-
-IF(Qt5Widgets_FOUND)
-  message(STATUS "Qt: Using version 5")
-  FIND_PACKAGE(Qt5Core QUIET)
-  FIND_PACKAGE(Qt5Gui QUIET)
-  FIND_PACKAGE(Qt5OpenGL QUIET)
-  FIND_PACKAGE(Qt5OpenGLExtensions QUIET)
-  IF ( Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Gui_FOUND AND Qt5OpenGL_FOUND AND Qt5OpenGLExtensions_FOUND )
-    SET(QT_INCLUDES ${Qt5Widgets_INCLUDE_DIRS} ${Qt5OpenGL_INCLUDE_DIRS} ${Qt5OpenGLExtensions_INCLUDE_DIRS})
-  ENDIF ()
-ELSEIF(QT4_FOUND)
-  message(STATUS "Qt: Using version 4")
-  INCLUDE(${QT_USE_FILE})
-  SET(QT_INCLUDES ${QT_INCLUDES} ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}${QT_QTOPENGL_INCLUDE_DIR} )
-  SET(QT_ALL_LIBRARIES ${QT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTOPENGL_LIBRARY})
-ENDIF ()
+ENDIF(UNIX AND NOT ANDROID)


-# Common global definitions
-#ADD_DEFINITIONS(-D)
 # Platform specific definitions


-IF(WIN32)
+IF(WIN32 AND NOT ANDROID)
  FIND_PACKAGE(GLCORE)
  IF(GLCORE_FOUND)
      INCLUDE_DIRECTORIES( ${GLCORE_INCLUDE_DIR} )
@@ -219,7 +213,7 @@ IF(WIN32)
        ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
        ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
    ENDIF(MSVC)
-ENDIF(WIN32)
+ENDIF(WIN32 AND NOT ANDROID)

 # Common to all platforms:

@@ -242,6 +236,7 @@ FIND_PACKAGE(OSG)
 INCLUDE_DIRECTORIES(
    ${OSGEARTH_SOURCE_DIR}/src
    ${OSG_INCLUDE_DIR}
+    ${OSG_GEN_INCLUDE_DIR}
 )

 #FIND_PACKAGE(GDAL)
@@ -258,12 +253,12 @@ ENDIF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
 # Installation stuff


-IF(UNIX AND NOT WIN32 AND NOT APPLE)
+IF(UNIX AND NOT WIN32 AND NOT APPLE AND NOT ANDROID)
  IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
      MARK_AS_ADVANCED(LIB_POSTFIX)
  ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
-ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
+ENDIF(UNIX AND NOT WIN32 AND NOT APPLE AND NOT ANDROID)
 IF(NOT DEFINED LIB_POSTFIX)
    SET(LIB_POSTFIX "")
 ENDIF(NOT DEFINED LIB_POSTFIX)
@@ -326,13 +321,17 @@ ENDIF(INSTALL_TO_OSG_DIR)
 # osgEarth Examples
 OPTION(BUILD_OSGEARTH_EXAMPLES "Enable to build osgEarth Examples" ON)

+# Applications and tests
+OPTION(BUILD_APPLICATIONS "Enable build of Applications" ON)
+OPTION(BUILD_TESTS "Enable build of Tests" ON)
+
 # OE Core
 ADD_SUBDIRECTORY(src)


 # Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4
 # and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support.
-IF(APPLE)
+IF(APPLE AND NOT ANDROID)

    # These are just defaults/recommendations, but how we want to build
    # out of the box. But the user needs to be able to change these options.
@@ -365,7 +364,7 @@ IF(APPLE)
    OPTION(OSGEARTH_BUILD_FRAMEWORKS "Compile frameworks instead of dylibs" OFF)
    SET(OSGEARTH_BUILD_FRAMEWORKS_INSTALL_NAME_DIR "@executable_path/../Frameworks" CACHE STRING "Install name dir for compiled frameworks")

-ENDIF(APPLE)
+ENDIF(APPLE AND NOT ANDROID)


 # This needs to be run very last so other parts of the scripts can take

--- a/CMakeModules/FindCURL.cmake
+++ b/CMakeModules/FindCURL.cmake
-FIND_PATH(CURL_INCLUDE_DIR curl.h curl/curl.h
-  $ENV{CURL_DIR}
-  NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-)
-
-FIND_PATH(CURL_INCLUDE_DIR curl.h curl/curl.h
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-)
-
-FIND_PATH(CURL_INCLUDE_DIR curl.h curl/curl.h
-  PATHS
-  ${THIRD_PARTY_DIR}/include
-  /usr/local/include/curl
-  /usr/local/include/CURL
-  /usr/local/include
-  /usr/include/curl
-  /usr/include/CURL
-  /usr/include
-  /sw/include/curl
-  /sw/include/CURL
-  /sw/include # Fink
-  /opt/local/include/curl
-  /opt/local/include/CURL
-  /opt/local/include # DarwinPorts
-  /opt/csw/include/curl
-  /opt/csw/include/CURL
-  /opt/csw/include # Blastwave
-  /opt/include/curl
-  /opt/include/CURL
-  /opt/include
-)
-
-#Find the CURL release library
-FIND_LIBRARY(CURL_LIBRARY
-  NAMES curl curllib CURL libcurl
-  PATHS
-  ${THIRD_PARTY_DIR}/lib
-  $ENV{CURL_DIR}
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib
-)
-FIND_LIBRARY(CURL_LIBRARY
-  NAMES curl CURL curllib libcurl
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
-FIND_LIBRARY(CURL_LIBRARY
-  NAMES curl CURL curllib libcurl
-  PATHS
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local
-    /usr
-    /sw
-    /opt/local
-    /opt/csw
-    /opt
-    /usr/freeware
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;CURL_ROOT]/lib
-  PATH_SUFFIXES lib64 lib
-)
-
-#Find the CURL debug library
-FIND_LIBRARY(CURL_LIBRARY_DEBUG
-  NAMES curlD curld curllibD curllibd CURLD libcurlD libcurld
-  PATHS
-  ${THIRD_PARTY_DIR}/lib
-  $ENV{CURL_DIR}
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib
-)
-FIND_LIBRARY(CURL_LIBRARY_DEBUG
-  NAMES curlD curld curllibD curllibd CURLD libcurlD libcurld
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
-FIND_LIBRARY(CURL_LIBRARY_DEBUG
-  NAMES curlD curld curllibD curllibd CURLD libcurlD libcurld
-  PATHS
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local
-    /usr
-    /sw
-    /opt/local
-    /opt/csw
-    /opt
-    /usr/freeware
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;CURL_ROOT]/lib
-  PATH_SUFFIXES lib64 lib
-)
-
-SET(CURL_FOUND "NO")
-IF(CURL_LIBRARY AND CURL_INCLUDE_DIR)
-  SET(CURL_FOUND "YES")
-ENDIF(CURL_LIBRARY AND CURL_INCLUDE_DIR)
-
--- a/CMakeModules/FindGDAL.cmake
+++ b/CMakeModules/FindGDAL.cmake
@@ -22,19 +22,13 @@
 SET(GDAL_DIR "" CACHE PATH "Root folder of GDAL dependency")

 FIND_PATH(GDAL_INCLUDE_DIR gdal.h
+  PATHS
    ${GDAL_DIR}
    $ENV{GDAL_DIR}
  NO_DEFAULT_PATH
  PATH_SUFFIXES include include/gdal
 )

-FIND_PATH(GDAL_INCLUDE_DIR gdal.h
-   ${GDAL_DIR}
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-)
-
 FIND_PATH(GDAL_INCLUDE_DIR gdal.h
  PATHS
    ${GDAL_DIR}/include
@@ -62,7 +56,8 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h
 )

 FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
+  NAMES
+    gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
  PATHS
    c:/Program Files/FWTools2.1.0/lib 
    ${GDAL_DIR}/lib
@@ -70,16 +65,10 @@ FIND_LIBRARY(GDAL_LIBRARY
  NO_DEFAULT_PATH
  PATH_SUFFIXES lib64 lib
 )
+
 FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    c:/Program Files/FWTools2.1.0/lib
-    ${GDAL_DIR}/lib
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
-FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
+  NAMES
+    gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
  PATHS
    ${GDAL_DIR}/lib
    ~/Library/Frameworks

--- a/CMakeModules/FindGEOS.cmake
+++ b/CMakeModules/FindGEOS.cmake
@@ -8,6 +8,7 @@
 SET(GEOS_DIR "" CACHE PATH "Root directory of GEOS distribution")

 FIND_PATH(GEOS_INCLUDE_DIR geos/geom/Geometry.h
+  PATHS
    ${GEOS_DIR}
    $ENV{GEOS_DIR}
  NO_DEFAULT_PATH
@@ -16,7 +17,6 @@ FIND_PATH(GEOS_INCLUDE_DIR geos/geom/Geometry.h

 FIND_PATH(GEOS_INCLUDE_DIR geos/geom/Geometry.h
  PATHS
-  ${GEOS_DIR}/include
    /usr/local/include/geos
    /usr/local/include/GEOS
    /usr/local/include

--- a/CMakeModules/FindOSG.cmake
+++ b/CMakeModules/FindOSG.cmake
@@ -20,14 +20,14 @@

 SET(OSG_DIR "" CACHE PATH "Set to base OpenSceneGraph install path")

-MACRO( FIND_OSG_INCLUDE THIS_OSG_INCLUDE_DIR THIS_OSG_INCLUDE_FILE )
-
-FIND_PATH( ${THIS_OSG_INCLUDE_DIR} ${THIS_OSG_INCLUDE_FILE}
+FIND_PATH(OSG_INCLUDE_DIR osg/Node
    PATHS
        ${OSG_DIR}
        $ENV{OSG_SOURCE_DIR}
        $ENV{OSGDIR}
        $ENV{OSG_DIR}
+        $ENV{OSG}
+        $ENV{OSG}
        /usr/local/
        /usr/
        /sw/ # Fink
@@ -38,13 +38,28 @@ FIND_PATH( ${THIS_OSG_INCLUDE_DIR} ${THIS_OSG_INCLUDE_FILE}
        ~/Library/Frameworks
        /Library/Frameworks
    PATH_SUFFIXES
-        /include/
+        /include
 )

-ENDMACRO( FIND_OSG_INCLUDE THIS_OSG_INCLUDE_DIR THIS_OSG_INCLUDE_FILE )
-
-FIND_OSG_INCLUDE( OSG_GEN_INCLUDE_DIR   osg/Config )
-FIND_OSG_INCLUDE( OSG_INCLUDE_DIR       osg/Node )
+FIND_PATH(OSG_GEN_INCLUDE_DIR osg/Config
+    PATHS
+        ${OSG_DIR}
+        $ENV{OSG_SOURCE_DIR}
+        $ENV{OSGDIR}
+        $ENV{OSG_DIR}
+        $ENV{OSG}
+        /usr/local/
+        /usr/
+        /sw/ # Fink
+        /opt/local/ # DarwinPorts
+        /opt/csw/ # Blastwave
+        /opt/
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/
+        ~/Library/Frameworks
+        /Library/Frameworks
+    PATH_SUFFIXES
+        /include
+)

 ###### libraries ######

@@ -59,6 +74,7 @@ FIND_LIBRARY(${MYLIBRARY}
        $ENV{OSG_DIR}
        $ENV{OSGDIR}
        $ENV{OSG_ROOT}
+        $ENV{OSG}
        ~/Library/Frameworks
        /Library/Frameworks
        /usr/local
@@ -119,19 +135,6 @@ FIND_OSG_LIBRARY( OSGMANIPULATOR_LIBRARY_DEBUG osgManipulatord )
 FIND_OSG_LIBRARY( OSGPARTICLE_LIBRARY osgParticle )
 FIND_OSG_LIBRARY( OSGPARTICLE_LIBRARY_DEBUG osgParticled )

-IF(OPENSCENEGRAPH_VERSION VERSION_LESS "3.5.6")
-  FIND_OSG_LIBRARY( OSGQT_LIBRARY osgQt )
-  FIND_OSG_LIBRARY( OSGQT_LIBRARY_DEBUG osgQtd )
-ELSE(OPENSCENEGRAPH_VERSION VERSION_LESS "3.5.6")
-  IF(Qt5Widgets_FOUND)
-    FIND_OSG_LIBRARY( OSGQT_LIBRARY osgQt5 )
-    FIND_OSG_LIBRARY( OSGQT_LIBRARY_DEBUG osgQt5d )
-  ELSE(Qt5Widgets_FOUND)
-    FIND_OSG_LIBRARY( OSGQT_LIBRARY osgQt )
-    FIND_OSG_LIBRARY( OSGQT_LIBRARY_DEBUG osgQtd )
-  ENDIF(Qt5Widgets_FOUND)
-ENDIF(OPENSCENEGRAPH_VERSION VERSION_LESS "3.5.6")
-
 FIND_OSG_LIBRARY( OPENTHREADS_LIBRARY OpenThreads )
 FIND_OSG_LIBRARY( OPENTHREADS_LIBRARY_DEBUG OpenThreadsd )


--- a/CMakeModules/FindPoco.cmake
+++ b/CMakeModules/FindPoco.cmake
@@ -8,6 +8,7 @@
 SET(POCO_DIR "" CACHE PATH "Set to base Poco install path")

 FIND_PATH(POCO_INCLUDE_DIR Poco/Poco.h
+  PATHS
    ${POCO_DIR}/include
    $ENV{POCO_DIR}/include
    $ENV{POCO_DIR}/Source/lib #Windows Binary Installer

--- a/CMakeModules/FindRocksDB.cmake
+++ b/CMakeModules/FindRocksDB.cmake
@@ -7,7 +7,13 @@ FIND_PATH(ROCKSDB_INCLUDE_DIR rocksdb/db.h
  ${ROCKSDB_DIR}
 )

-find_library(ROCKSDB_LIBRARY NAMES ROCKSDBLIB rocksdb
+if(RocksDB_FIND_REQUIRED_STATIC)
+	set(ROCKSDB_LIB "rocksdblib")
+else()
+	set(ROCKSDB_LIB "rocksdb")
+endif()
+
+find_library(ROCKSDB_LIBRARY NAMES ${ROCKSDB_LIB}
 			 PATHS
 			   ${ROCKSDB_DIR}
 			   ${ROCKSDB_DIR}/bin/Release
@@ -16,7 +22,7 @@ find_library(ROCKSDB_LIBRARY NAMES ROCKSDBLIB rocksdb
 		)


-find_library(ROCKSDB_LIBRARY_DEBUG NAMES ROCKSDBLIB rocksdb
+find_library(ROCKSDB_LIBRARY_DEBUG NAMES ${ROCKSDB_LIB}d ${ROCKSDB_LIB}
 			 PATHS
 			   ${ROCKSDB_DIR}
 			   ${ROCKSDB_DIR}/bin/Debug
@@ -24,19 +30,15 @@ find_library(ROCKSDB_LIBRARY_DEBUG NAMES ROCKSDBLIB rocksdb
 			 PATH_SUFFIXES lib lib64
 			)

-if( ROCKSDB_LIBRARY )
-  MESSAGE(STATUS "FOUND ROCKSDB_LIBRARY")
-endif()
-
-if (ROCKSDB_INCLUDE_DIR)
-  MESSAGE(STATUS "FOUND ROCKSDB_INCLUDE_DIR")
-endif()
-  
+find_package_handle_standard_args(ROCKSDB
+    FOUND_VAR
+      ROCKSDB_FOUND
+    REQUIRED_VARS
+      ROCKSDB_LIBRARY
+      ROCKSDB_INCLUDE_DIR
+    FAIL_MESSAGE
+      "Could NOT find ROCKSDB"
+)

-set( ROCKSDB_FOUND "NO" )
-if( ROCKSDB_LIBRARY AND ROCKSDB_INCLUDE_DIR )
-    set( ROCKSDB_FOUND "YES" )
-    MESSAGE(STATUS "Found RocksDB library: " ${ROCKSDB_LIBRARY})
-else()
-    MESSAGE(STATUS "Could not find ROCKSDB")
-endif()
+set(ROCKSDB_INCLUDE_DIRS ${ROCKSDB_INCLUDE_DIR} )
+set(ROCKSDB_LIBRARIES ${ROCKSDB_LIBRARY})
--- a/CMakeModules/FindSqlite3.cmake
+++ b/CMakeModules/FindSqlite3.cmake
@@ -5,6 +5,7 @@
 # SQLITE3_INCLUDE_DIR, where to find the headers

 FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
+  PATHS
    ${SQLITE3_DIR}/include/sqlite
    $ENV{SQLITE3_DIR}/include/sqlite
    $ENV{SQLITE3_DIR}/Source/lib/sqlite #Windows Binary Installer
@@ -22,7 +23,8 @@ FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
 )

 FIND_LIBRARY(SQLITE3_LIBRARY
-    NAMES sqlite3 libsqlite3
+  NAMES
+    sqlite3 libsqlite3
  PATHS
    ${SQLITE3_DIR}/lib
    $ENV{SQLITE3_DIR}/lib

--- a/CMakeModules/OsgEarthMacroUtils.cmake
+++ b/CMakeModules/OsgEarthMacroUtils.cmake
@@ -85,7 +85,7 @@ ENDMACRO(DETECT_OSG_VERSION)
 #  full path of the library name. in order to differentiate release and debug, this macro get the
 #  NAME of the variables, so the macro gets as arguments the target name and the following list of parameters
 #  is intended as a list of variable names each one containing  the path of the libraries to link to
-#  The existance of a variable name with _DEBUG appended is tested and, in case it' s value is used
+#  The existence of a variable name with _DEBUG appended is tested and, in case it's value is used
 #  for linking to when in debug mode
 #  the content of this library for linking when in debugging
 #######################################################################################################
@@ -169,12 +169,13 @@ MACRO(SETUP_LINK_LIBRARIES)
 #    ENDFOREACH(LINKLIB)
    LINK_INTERNAL(${TARGET_TARGETNAME} ${TARGET_LIBRARIES})

-    FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES})
-            TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB})
-    ENDFOREACH(LINKLIB)
    IF(TARGET_LIBRARIES_VARS)
            LINK_WITH_VARIABLES(${TARGET_TARGETNAME} ${TARGET_LIBRARIES_VARS})
    ENDIF(TARGET_LIBRARIES_VARS)
+
+    FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES})
+            TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB})
+    ENDFOREACH(LINKLIB)
 ENDMACRO(SETUP_LINK_LIBRARIES)

 ############################################################################################
@@ -231,6 +232,10 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
 		
    ENDIF(WIN32)

+    IF(OSG_BUILD_PLATFORM_IPHONE)
+        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE ${IPHONE_ENABLE_BITCODE})
+    ENDIF()
+
    # install the shader source files
    if(OSGEARTH_INSTALL_SHADERS)
        INSTALL(
@@ -318,6 +323,10 @@ MACRO(SETUP_EXTENSION PLUGIN_NAME)
            DESTINATION resources/shaders )
    endif(OSGEARTH_INSTALL_SHADERS)

+    IF(OSG_BUILD_PLATFORM_IPHONE)
+        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE ${IPHONE_ENABLE_BITCODE})
+    ENDIF()
+    
 #finally, set up the solution folder -gw
    SET_PROPERTY(TARGET ${TARGET_TARGETNAME} PROPERTY FOLDER "Extensions")    
    
@@ -383,6 +392,10 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP)
    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES RELWITHDEBINFO_OUTPUT_NAME "${TARGET_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}")
    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES MINSIZEREL_OUTPUT_NAME "${TARGET_NAME}${CMAKE_MINSIZEREL_POSTFIX}")

+    IF(OSG_BUILD_PLATFORM_IPHONE)
+        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE ${IPHONE_ENABLE_BITCODE})
+    ENDIF()
+
    SETUP_LINK_LIBRARIES()

 ENDMACRO(SETUP_EXE)

--- a/CMakeModules/UtilityMacros.cmake
+++ b/CMakeModules/UtilityMacros.cmake
@@ -3,7 +3,7 @@ INCLUDE(ListHandle)


  MACRO(FILTER_OUT FILTERS INPUTS OUTPUT)
-       # Mimicks Gnu Make's $(filter-out) which removes elements 
+       # Mimics Gnu Make's $(filter-out) which removes elements 
       # from a list that match the pattern.
       # Arguments:
       #  FILTERS - list of patterns that need to be removed

--- a/appveyor.yml
+++ b/appveyor.yml
+version: 1.0.{build}
+shallow_clone: true
+os: Visual Studio 2017
+
+install:
+  #- cd C:\tools\vcpkg
+  #- vcpkg install osg:x64-windows sqlite3:x64-windows protobuf:x64-windows poco:x64-windows
+  #- vcpkg integrate install
+  - mkdir c:\temp
+  - cd c:\temp
+  - ps: Start-FileDownload 'https://s3.amazonaws.com/pelican-public/osgearth-vcpkg-deps.7z'
+  - 7z x osgearth-vcpkg-deps.7Z
+  - cd C:\projects\osgearth
+
+build_script:
+  - mkdir build
+  - cd build
+  #- cmake .. -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DWIN32_USE_MP=ON -DCMAKE_INSTALL_PREFIX=c:\projects\osgearth\install -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
+  - cmake .. -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DWIN32_USE_MP=ON -DCMAKE_INSTALL_PREFIX=c:\projects\osgearth\install -DCMAKE_TOOLCHAIN_FILE=c:/temp/osgearth-vcpkg-deps/scripts/buildsystems/vcpkg.cmake
+  - cmake --build . --target INSTALL --config Release
+  - cd ..\install
+  - 7z a c:\projects\osgearth\osgearth.zip .
+
+cache: c:\tools\vcpkg\installed\
+
+artifacts:
+  - path: osgearth.zip
+    name: osgearth
+
+notifications:
+  - provider: Slack
+    incoming_webhook:
+      secure: CeOwsQhxU4rvSp7EJrBWYhhfAhTFRMH/RxKYr2PBrAi3vk5hbMJBBYtvPAGtHMXp7k1E0JwbeC3rrtpVtg6wqbpplVMDSQZs+26H/LSY2so=
+
+
+
--- a/debian/changelog
+++ b/debian/changelog
-osgearth (2.9.0+dfsg-4) UNRELEASED; urgency=medium
+osgearth (2.10.0+dfsg-1~exp1) experimental; urgency=medium

+  * New upstream release.
  * Bump Standards-Version to 4.2.1, no changes.
  * Update watch file to limit matches to archive path.
  * Add Build-Depends-Package field to symbols files.
+  * Update Files-Excluded for osgEarth 2.10.
+  * Update copyright file, changes:
+    - Update copyright years for Pelican Mapping
+    - Add license & copyright for EGLview.java
+  * Refresh patches.
+  * Drop libosgearthqt5 package, osgEarthQt not longer built.
+  * Add lintian override for spelling error false positive.
+  * Remove package name from lintian overrides.
+  * Add manpages for new executables.
+  * Update symbols for amd64.

- -- Bas Couwenberg <sebastic@debian.org>  Sun, 05 Aug 2018 20:37:24 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 13 Nov 2018 07:31:56 +0100

 osgearth (2.9.0+dfsg-3) unstable; urgency=medium


--- a/debian/control
+++ b/debian/control
@@ -15,10 +15,8 @@ Build-Depends: debhelper (>= 9),
               libexpat1-dev,
               libnoise-dev,
               libprotobuf-dev,
-               libqt5opengl5-dev,
               libsqlite3-dev,
               protobuf-compiler,
-               qtbase5-dev,
               zlib1g-dev,
               pkg-kde-tools,
               docbook2x,
@@ -111,22 +109,6 @@ Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarthFe
 .
 This package contains the shared library libosgEarthFeatures.

-Package: libosgearthqt5-5
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Suggests: openscenegraph-3.4
-Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarthQt)
- osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
- (OSG), an open source, high performance, 3D graphics toolkit. Just create a
- simple XML file, point it at your imagery, elevation, and vector data, load it
- into your favorite OSG application, and go! osgEarth supports all kinds of
- data and comes with lots of examples to help you get up and running quickly
- and easily.
- .
- This package contains the shared library libosgEarthQt.
-
 Package: libosgearthsplat5
 Architecture: any
 Section: libs
@@ -195,7 +177,6 @@ Section: libdevel
 Depends: libosgearth5 (= ${binary:Version}),
         libosgearthannotation5 (= ${binary:Version}),
         libosgearthfeatures5 (= ${binary:Version}),
-         libosgearthqt5-5 (= ${binary:Version}),
         libosgearthsplat5 (= ${binary:Version}),
         libosgearthsymbology5 (= ${binary:Version}),
         libosgearthutil5 (= ${binary:Version}),

--- a/debian/copyright
+++ b/debian/copyright
@@ -31,10 +31,12 @@ Files-Excluded: data/2s19_ru_desert.tga
 data/2s19_ru_desert.tga.attr
 data/2s19_ru_dmg_desert.tga
 data/2s19_ru_tred_common.tga
+ data/airport.png
 data/arconline_nodata.png
 data/asphalt.jpg
 data/axes.osgt
 data/bank.png
+ data/bluemarble_tilepackage/*
 data/BostonBldgs.kmz
 data/boston_buildings_utm19.*
 data/boston-inset.tif
@@ -44,22 +46,18 @@ Files-Excluded: data/2s19_ru_desert.tga
 data/boxman.osg
 data/cessna.osgb
 data/ci10nv09.*
- data/cities.dbf
- data/cities.prj
- data/cities.shp
- data/cities.shx
- data/cities_mercator.dbf
- data/cities_mercator.prj
- data/cities_mercator.shp
- data/cities_mercator.shx
+ data/cities.gpkg
+ data/cities_mercator.*
 data/cloud_combined_2048.jpg
 data/colorramps/*
 data/dcbuildings.*
 data/downarrow.png
 data/fells_loop.gpx
+ data/flag_us.png
 data/flatten_mt_rainier.*
 data/fractal.png
 data/france.*
+ data/grid2.png
 data/honolulu.mbtiles
 data/hospital.png
 data/icon.png
@@ -73,7 +71,6 @@ Files-Excluded: data/2s19_ru_desert.tga
 data/mgrs_sqid.bin
 data/moon_1024x512.jpg
 data/ne_10m_coastline.zip
- data/ne_cities.*
 data/nodata.tif
 data/noise3.png
 data/nyc-inset-wgs84.tif
@@ -98,6 +95,7 @@ Files-Excluded: data/2s19_ru_desert.tga
 data/tank.FLT
 data/terrain/*
 data/test_bump.png
+ data/textures/*
 data/tfs_boston.zip
 data/tree.gif
 data/tree.ive
@@ -113,14 +111,19 @@ Files-Excluded: data/2s19_ru_desert.tga
 data/world.prj
 data/world.shp
 data/world.shx
+ data/world_countries.mbtiles
 License: LGPL-3+

 Files: *
-Copyright: 2008-2016, Pelican Mapping
+Copyright: 2008-2018, Pelican Mapping
                2012, Thomas Hogarth
           2008-2010, Pelican Ventures, Inc
 License: LGPL-2+

+Files: src/applications/osgearth_viewer_android/src/osg/AndroidExample/EGLview.java
+Copyright: 2008, The Android Open Source Project
+License: Apache-2.0
+
 Files: src/applications/osgearth_viewerIOS/EarthMultiTouchManipulator.cpp
 src/applications/osgearth_viewerIOS/EarthMultiTouchManipulator.h
 Copyright: 1998-2010, Robert Osfield
@@ -250,6 +253,22 @@ License: AGG
 Robert Wilhelm, and Werner Lemberg - the authors of the FreeType
 libray - in producing this work. See http://www.freetype.org for details.

+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License can be found
+ in `/usr/share/common-licenses/Apache-2.0'.
+
 License: BSL-1.0
 Boost Software License - Version 1.0 - August 17th, 2003
 .

--- a/debian/libosgearth5.lintian-overrides
+++ b/debian/libosgearth5.lintian-overrides
 # Linking with libtinyxml is risky, because osgearth contains
 # patched version from CVS, compiled without TIXML_USE_STL.
 # libtinyxml provides only tinyxml with STL support.
-libosgearth5: embedded-library usr/lib/libosgEarth.so.*: tinyxml
+embedded-library usr/lib/libosgEarth.so.*: tinyxml

 # False positive, string not included in source.
-libosgearth5: spelling-error-in-binary usr/lib/libosgEarth.so.* refrenced referenced
+spelling-error-in-binary usr/lib/libosgEarth.so.* refrenced referenced

--- a/debian/libosgearth5.symbols
+++ b/debian/libosgearth5.symbols
--- a/debian/libosgearthannotation5.symbols
+++ b/debian/libosgearthannotation5.symbols
--- a/debian/libosgearthfeatures5.symbols
+++ b/debian/libosgearthfeatures5.symbols
--- a/debian/libosgearthqt5-5.install
+++ b/debian/libosgearthqt5-5.install
-usr/lib/libosgEarthQt5.so.*