From b06ad7cd79023ca47d54317c6cad500bd2187186 Mon Sep 17 00:00:00 2001
From: a dinosaur <dino@a-dinosaur.com>
Date: Thu, 28 Mar 2024 21:14:49 +1100
Subject: [PATCH] revamp pugixml find behaviour

---
 .github/workflows/cmake.yml     |  4 ++--
 CMakeLists.txt                  |  8 ++------
 cmake/modules/FindPUGIXML.cmake | 10 ----------
 cmake/modules/FindTMXLITE.cmake | 10 ----------
 ext/tmxlite/CMakeLists.txt      | 13 ++-----------
 5 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 cmake/modules/FindPUGIXML.cmake
 delete mode 100644 cmake/modules/FindTMXLITE.cmake

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 07852c5..20098b2 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -23,7 +23,7 @@ jobs:
         - { name: "Windows MSVC x86", os: windows-latest, artifact: windows-x86, arch: x86 }
         - { name: "Windows MSVC x64", os: windows-latest, artifact: windows-x64 }
         - { name: "Windows MSVC ARM64", os: windows-latest, artifact: windows-arm64, arch: amd64_arm64 }
-        - { name: "Ubuntu", artifact: "linux", os: ubuntu-latest, extra: "-DUSE_BUNDLED_ZSTD:BOOL=OFF" }
+        - { name: "Ubuntu", artifact: "linux", os: ubuntu-latest, extra: "-DUSE_BUNDLED_ZSTD:BOOL=OFF -DUSE_BUNDLED_PUGIXML:BOOL=OFF" }
     runs-on: ${{matrix.config.os}}
 
     steps:
@@ -38,7 +38,7 @@ jobs:
     - uses: awalsh128/cache-apt-pkgs-action@latest
       if: ${{matrix.config.artifact == 'linux'}}
       with:
-        packages: libzstd-dev
+        packages: libzstd-dev libpugixml-dev
         version: 1.0
 
     - name: Configure CMake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0e3aee..d8997ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
 if (USE_BUNDLED_PUGIXML)
 	add_subdirectory(ext/pugixml)
 else()
-	find_package(PUGIXML REQUIRED)
+	find_package(pugixml REQUIRED CONFIG)
 endif()
 
 if (USE_ZLIB)
@@ -42,11 +42,7 @@ endif()
 
 add_subdirectory(ext/base64)
 
-if (USE_BUNDLED_TMXLITE)
-	add_subdirectory(ext/tmxlite)
-else()
-	find_package(TMXLITE REQUIRED)
-endif()
+add_subdirectory(ext/tmxlite)
 
 # Main tmx2gba sources
 add_subdirectory(src)
diff --git a/cmake/modules/FindPUGIXML.cmake b/cmake/modules/FindPUGIXML.cmake
deleted file mode 100644
index a6a6798..0000000
--- a/cmake/modules/FindPUGIXML.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-find_path(PUGIXML_INCLUDE_DIR NAMES pugixml.hpp)
-find_library(PUGIXML_LIBRARY NAMES pugixml)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PUGIXML DEFAULT_MSG
-                                  PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR)
-
-mark_as_advanced(PUGIXML_INCLUDE_DIR
-                 PUGIXML_LIBRARY)
-
diff --git a/cmake/modules/FindTMXLITE.cmake b/cmake/modules/FindTMXLITE.cmake
deleted file mode 100644
index c0f849c..0000000
--- a/cmake/modules/FindTMXLITE.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-include(FindPackageHandleStandardArgs)
-
-# Search for the header file
-find_path(TMXLITE_INCLUDE_DIR NAMES tmxlite/Config.hpp PATH_SUFFIXES include)
-
-# Search for the library
-find_library(TMXLITE_LIBRARIES NAMES tmxlite PATH_SUFFIXES lib)
-
-# Did we find everything we need?
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(tmxlite DEFAULT_MSG TMXLITE_LIBRARIES TMXLITE_INCLUDE_DIR) 
diff --git a/ext/tmxlite/CMakeLists.txt b/ext/tmxlite/CMakeLists.txt
index cf96564..b648a74 100644
--- a/ext/tmxlite/CMakeLists.txt
+++ b/ext/tmxlite/CMakeLists.txt
@@ -27,14 +27,8 @@ if (MSVC)
 	target_compile_definitions(tmxlite PRIVATE _CRT_SECURE_NO_WARNINGS)
 endif()
 
-target_link_libraries(tmxlite base64::base64)
-
-if (USE_BUNDLED_PUGIXML)
-	target_link_libraries(tmxlite pugixml::static)
-else()
-	target_include_directories(tmxlite PRIVATE ${PUGIXML_INCLUDE_DIR})
-	target_link_libraries(tmxlite ZLIB::ZLIB ${PUGIXML_LIBRARY})
-endif()
+target_compile_definitions(tmxlite PRIVATE USE_ZSTD)
+target_link_libraries(tmxlite base64::base64 pugixml Zstd::Zstd)
 
 if (USE_ZLIB)
 	target_compile_definitions(tmxlite PRIVATE USE_ZLIB)
@@ -43,7 +37,4 @@ else()
 	target_link_libraries(tmxlite miniz::miniz)
 endif()
 
-target_compile_definitions(tmxlite PRIVATE USE_ZSTD)
-target_link_libraries(tmxlite Zstd::Zstd)
-
 target_include_directories(tmxlite PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)