Merge branch 'master' of github.com:gwaldron/osgearth

share/ExternalProject/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+
+project(ExternalExample)
+
+find_package(osgEarth CONFIG REQUIRED)
+
+add_executable(ExternalExample main.cpp)
+
+target_link_libraries(ExternalExample PRIVATE osgEarth)

share/ExternalProject/README.md

@@ -0,0 +1,10 @@
+# External Project Example
+This is a simple example to test the `osgEarthConfig.cmake` packaging configuration file for CMake.
+
+These line in your `CMakeLists.txt` will tell CMake to look for `osgEarthConfig.cmake` and use it to resolve osgEarth and its public-facing dependencies:
+```
+find_package(osgEarth CONFIG REQUIRED)
+...
+target_link_libraries(my_project PRIVATE osgEarth)
+```
+You may need to update your `CMAKE_PREFIX_PATH` to include the location of `osgEarthConfig.cmake`.

share/ExternalProject/main.cpp

@@ -0,0 +1,24 @@
+#include <osgEarth/MapNode>
+#include <osgEarth/TMS>
+#include <osgEarth/EarthManipulator>
+#include <osgViewer/Viewer>
+
+int main(int argc, char** argv)
+{
+    osg::ArgumentParser args(&argc, argv);
+    osgViewer::Viewer viewer(args);
+
+    osgEarth::initialize();
+    osgEarth::setNotifyLevel(osg::INFO);
+
+    auto layer = new osgEarth::TMSImageLayer();
+    layer->setURL("https://readymap.org/readymap/tiles/1.0.0/7/");
+
+    auto mapNode = new osgEarth::MapNode();
+    mapNode->getMap()->addLayer(layer);
+
+    viewer.setCameraManipulator(new osgEarth::Util::EarthManipulator());
+
+    viewer.setSceneData(mapNode);
+    return viewer.run();
+}

src/osgEarth/CMakeLists.txt

@@ -41,8 +41,9 @@ IF(WIN32)
     LIST(APPEND TARGET_EXTERNAL_LIBRARIES psapi)
 ENDIF(WIN32)
 
-
-LIST(APPEND TARGET_EXTERNAL_LIBRARIES meshoptimizer::meshoptimizer)
+IF(meshoptimizer_FOUND)
+    LIST(APPEND TARGET_EXTERNAL_LIBRARIES meshoptimizer::meshoptimizer)
+ENDIF()
 
 
 # Generate the Version header.

src/osgEarth/weejobs.h

@@ -16,6 +16,7 @@
 #include <thread>
 #include <type_traits>
 #include <vector>
+#include <string>
 
  // OPTIONAL: Define WEEJOBS_EXPORT if you want to use this library from multiple modules (DLLs)
 #ifndef WEEJOBS_EXPORT