Merge branch 'b-cmake' of github.com:gwaldron/osgearth into b-cmake

gwaldron · May 16, 2024 · 0727d08 · 0727d08
2 parents a44c6cc + 948dc93
commit 0727d08
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/src/osgEarth/BuildConfig.in b/src/osgEarth/BuildConfig.in
@@ -11,7 +11,6 @@
 #cmakedefine OSGEARTH_HAVE_PROTOBUF
 #cmakedefine OSGEARTH_HAVE_SPDLOG
 #cmakedefine OSGEARTH_HAVE_SQLITE3
-#cmakedefine OSGEARTH_HAVE_TINYXML
 #cmakedefine OSGEARTH_HAVE_TRACY
 
 #cmakedefine OSGEARTH_HAVE_CESIUM_NODEKIT

diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt
@@ -870,19 +870,11 @@ if (spdlog_FOUND)
     target_link_libraries(${LIB_NAME} PRIVATE spdlog::spdlog)
 endif()
 
-# TinyXML support?
-if (TinyXML_FOUND)
-    set(OSGEARTH_HAVE_TINYXML ON)
-    include_directories(${TinyXML_INCLUDE_DIRS})
-    target_link_libraries(${LIB_NAME} PRIVATE ${TinyXML_LIBRARIES})
-    add_definitions(-DTIXML_USE_STL)
-endif()
-
 # MBTiles support?
 if(SQLite3_FOUND)
     set(OSGEARTH_HAVE_SQLITE3 ON)
     set(OSGEARTH_HAVE_MBTILES ON)
-    include_directories(${SQLITE3_INCLUDE_DIR})
+    include_directories(${SQLite3_INCLUDE_DIR})
     target_link_libraries(${LIB_NAME} PRIVATE ${SQLite3_LIBRARIES})
 endif()
 

diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json
@@ -20,7 +20,6 @@
         "osg",
         "protobuf",
         "sqlite3",
-        "tinyxml",
         "rocksdb",
         "spdlog",
         "meshoptimizer"