revamp pugixml find behaviour

ScrelliCopter · Mar 28, 2024 · b06ad7c · b06ad7c
1 parent 320bc19
commit b06ad7c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 39 deletions.
diff --git 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
@@ -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
diff --git a/cmake/modules/FindTMXLITE.cmake b/cmake/modules/FindTMXLITE.cmake
diff --git 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)