get yaml-cpp in CmakeLists, fix up compile issue with libexpat in XMP

CMakeLists.txt

@@ -123,8 +123,15 @@ find_package(OpenGL REQUIRED)  # for Dear ImGui
 find_package(Threads REQUIRED) # for GLFW
 find_package(X11 REQUIRED)     # for GLFW
 
-# Yaml-cpp
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/src/ThirdParty/yaml-cpp)
+# Download and fetch yaml-cpp
+FetchContent_Declare(
+        yaml-cpp
+        GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
+        GIT_TAG 0.8.0
+)
+
+set(YAML_CPP_BUILD_TESTS OFF)
+FetchContent_MakeAvailable(yaml-cpp)
 
 # Zero MQ should be install as part of the pipeline or using vcpkg
 if (WIN32)
@@ -161,7 +168,6 @@ target_include_directories(
         ${imgui_SOURCE_DIR}/misc/cpp
         ${glm_SOURCE_DIR}/src
         ${CMAKE_HOME_DIRECTORY}/src
-        ${CMAKE_HOME_DIRECTORY}/src/ThirdParty/yaml-cpp/include
         ${CMAKE_HOME_DIRECTORY}/src/ThirdParty/XMP/XMP-Toolkit-SDK/public/include
 )
 

src/Client/Commands.h

@@ -1,6 +1,6 @@
 // Description of commands and the parameters we can use when sending to server
 #pragma once
-#include "yaml-cpp/node/node.h"
+#include <yaml-cpp/node/node.h>
 #include "Config/config.h"
 #include <vector>
 #include <string>

src/Display/Menus/TopBar/QDisplay_ConfigureModel.h

@@ -9,8 +9,8 @@
 #include "Display/QDisplay_Base.h"
 #include <imgui_stdlib.h>
 
-#include "yaml-cpp/emittermanip.h"
-#include "yaml-cpp/node/detail/iterator_fwd.h"
+#include <yaml-cpp/emittermanip.h>
+#include <yaml-cpp/node/detail/iterator_fwd.h>
 #include <yaml-cpp/yaml.h>
 #include <yaml-cpp/exceptions.h>
 

src/Display/Menus/TopBar/QDisplay_ImportModel.h

@@ -9,7 +9,7 @@
 #include <imgui.h>
 #include "ThirdParty/imgui/imfilebrowser.h"
 #include <imgui_stdlib.h>
-#include "yaml-cpp/emittermanip.h"
+#include <yaml-cpp/emittermanip.h>
 #include <yaml-cpp/yaml.h>
 #include <yaml-cpp/exceptions.h>
 #include <filesystem>

src/Display/Menus/TopBar/QDisplay_PluginsWindow.h

@@ -7,8 +7,8 @@
 #include <imgui.h>
 #include <filesystem>
 #include <imgui_stdlib.h>
-#include "yaml-cpp/emittermanip.h"
-#include "yaml-cpp/node/detail/iterator_fwd.h"
+#include <yaml-cpp/emittermanip.h>
+#include <yaml-cpp/node/detail/iterator_fwd.h>
 #include <yaml-cpp/yaml.h>
 #include <yaml-cpp/exceptions.h>
 

src/ThirdParty/XMP/build_xmp_libraries.bat

@@ -11,8 +11,8 @@ set "lib_output=%CD%\lib"
 pushd src\ThirdParty\XMP
 
 if not exist "XMP-Toolkit-SDK\" (
-    :: Setup base library
-    git clone https://github.com/adobe/XMP-Toolkit-SDK
+    :: Setup base library, we are using v2023.07
+    git clone --depth 1 --branch v2023.07 https://github.com/adobe/XMP-Toolkit-SDK
 
     :: Copy overrides
     copy overrides\CMakeUtils.bat XMP-Toolkit-SDK\build\shared\CMakeUtils.bat
@@ -28,7 +28,7 @@ if not exist "XMP-Toolkit-SDK\" (
     rmdir zlib /s /q
 
     :: Set up libexpat
-    git clone https://github.com/libexpat/libexpat
+    git clone --depth 1 --branch R_2_5_0 https://github.com/libexpat/libexpat
     move libexpat\expat\lib XMP-Toolkit-SDK\third-party\expat\
     rmdir libexpat /s /q
 )

src/ThirdParty/XMP/build_xmp_libraries.sh

@@ -18,8 +18,8 @@ lib_output=$(pwd)/lib
 pushd src/ThirdParty/XMP
 
 if [ ! -d "XMP-Toolkit-SDK" ]; then
-    # Setup base library
-    git clone https://github.com/adobe/XMP-Toolkit-SDK
+    # Setup base library, we are using v2023.07
+    git clone --depth 1 --branch v2023.07 https://github.com/adobe/XMP-Toolkit-SDK
 
     # Setup zlib
     wget https://www.zlib.net/current/zlib.tar.gz
@@ -31,8 +31,8 @@ if [ ! -d "XMP-Toolkit-SDK" ]; then
     rm -rf zlib*
 
     # Set up libexpat
-    git clone https://github.com/libexpat/libexpat
-    mkdir -p src/ThirdParty/XMP/XMP-Toolkit-SDK/third-party/expat
+    git clone --depth 1 --branch R_2_5_0 https://github.com/libexpat/libexpat
+    mkdir -p XMP-Toolkit-SDK/third-party/expat
     cp -r libexpat/expat/lib XMP-Toolkit-SDK/third-party/expat/
     rm -rf libexpat
 fi