Merge pull request #589 from CesiumGS/tinyxml2-upgrade

Upgrade tinyxml2
CesiumGS · Jan 29, 2023 · e063364 · e063364
2 parents 812e819 + 77c7bad
commit e063364
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CesiumAsync/test/TestInternalTimegm.cpp b/CesiumAsync/test/TestInternalTimegm.cpp
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "InternalTimegm.h"
 
 #include <catch2/catch.hpp>

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -50,8 +50,14 @@ if (NOT TARGET glm)
     add_subdirectory(glm GLM)
 endif()
 
-set(BUILD_TESTS OFF CACHE BOOL "Build tinyxml2 tests" FORCE)
-add_subdirectory(tinyxml2)
+# tinyxml2's CMake build tries to generate a pkg-config file in a way that's incompatible with multi-config generators
+# (e.g., Visual Studio). And anyway it's trivial to build manually, so we do that here.
+add_library(tinyxml2 tinyxml2/tinyxml2.cpp)
+target_include_directories(
+    tinyxml2
+    PUBLIC
+        tinyxml2
+)
 
 add_subdirectory(asyncplusplus)
 

diff --git a/extern/tinyxml2 b/extern/tinyxml2