use conan

Author: razaqq

.github/conan/profiles/linux-gcc

@@ -0,0 +1,13 @@
+[settings]
+arch=x86_64
+build_type=Release
+compiler=gcc
+compiler.cppstd=23
+compiler.libcxx=libstdc++11
+compiler.version=14
+os=Linux
+
+[conf]
+tools.build:compiler_executables={'cpp': 'g++-14', 'c': 'gcc-14'}
+tools.cmake.cmake_layout:build_folder_vars+=["settings.compiler"]
+tools.cmake.cmaketoolchain:generator=Ninja

.github/conan/profiles/windows-clang-cl

@@ -0,0 +1,22 @@
+[settings]
+arch=x86_64
+build_type=Release
+compiler=clang
+compiler.cppstd=23
+compiler.runtime=dynamic
+compiler.runtime_type=Release
+compiler.runtime_version=v144
+compiler.version=17
+os=Windows
+openssl/*:compiler=msvc
+openssl/*:compiler.cppstd=17
+openssl/*:compiler.runtime=dynamic
+openssl/*:compiler.runtime_type=Release
+openssl/*:compiler.version=194
+
+[conf]
+tools.cmake.cmake_layout:build_folder_vars=['settings.compiler']
+tools.cmake.cmaketoolchain:generator=Ninja
+!openssl*:tools.build:compiler_executables={'cpp': 'clang-cl', 'c': 'clang-cl'}
+!openssl*:tools.build:exelinkflags=['clang_rt.builtins-x86_64.lib']
+!openssl*:tools.build:sharedlinkflags=['clang_rt.builtins-x86_64.lib']

.github/workflows/build.yaml

@@ -4,19 +4,12 @@ on: [push]
 
 jobs:
   build-windows:
-    name: Build Windows Qt${{ matrix.qt-major-version }}
-    strategy:
-      matrix:
-        qt-major-version: [6, 5]
-        include:
-          - qt-major-version: 6
-            qt-version: 6.7.2
-            clang-version: 18
-            zipfile: PotatoAlert.zip
-          - qt-major-version: 5
-            qt-version: 5.15.2
-            clang-version: 17  # until Qt 5.15.2 fixes qsizepolicy.h(137,38): error : invalid bitwise operation between different enumeration types ('Policy' and 'QSizePolicy::PolicyFlag')
-            zipfile: PotatoAlert_win7.zip
+    name: Build Windows Qt6
+    env:
+      qt-major-version: 6
+      qt-version: 6.7.2
+      clang-version: 18
+      zipfile: PotatoAlert.zip
 
     runs-on: windows-2022
 
@@ -29,85 +22,105 @@ jobs:
         with:
           arch: x64
 
+      - name: Setup Conan
+        run: |
+          pip install conan
+          conan profile detect
+
       - name: Setup Ninja
         uses: seanmiddleditch/gha-setup-ninja@v5
         with:
           version: 1.12.1
 
-      - name: Install Qt${{ matrix.qt-major-version }}
+      - name: Install Qt${{ env.qt-major-version }}
         uses: jurplel/install-qt-action@v4
         with:
-          version: ${{ matrix.qt-version }}
+          version: ${{ env.qt-version }}
           cache: true
 
       - name: Install LLVM and Clang
         uses: KyleMayes/install-llvm-action@v2
         with:
-          version: ${{ matrix.clang-version }}
+          version: ${{ env.clang-version }}
+
+      - name: Conan Version
+        run: conan --version
 
       - name: CMake Version
         run: cmake --version
 
       - name: Clang Version
         run: clang-cl --version
 
+      - name: Ninja Version
+        run: ninja --version
+
+      - name: Cache Conan Dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.conan2
+          key: hashFiles('**/conanfile.py')
+
+      - name: Run Conan
+        run: conan build . --build=missing --profile:all=./.github/conan/profiles/windows-clang-cl
+
       - name: Run CMake
         env:
           CC: "${{ env.LLVM_PATH }}\\bin\\clang-cl"
           CXX: "${{ env.LLVM_PATH }}\\bin\\clang-cl"
-        run: cmake -S . -B build -G Ninja -DCMAKE_RC_COMPILER=RC -DCMAKE_BUILD_TYPE=Release -DPA_SUBMIT_URL=${{ secrets.PA_SUBMIT_URL }} -DPA_LOOKUP_URL=${{ secrets.PA_LOOKUP_URL }}
+        run: cmake -S . -DCMAKE_RC_COMPILER=RC -DPA_SUBMIT_URL=${{ secrets.PA_SUBMIT_URL }} -DPA_LOOKUP_URL=${{ secrets.PA_LOOKUP_URL }} --preset conan-clang-release
 
       - name: Run Build
-        run: cmake --build build --config Release --target PotatoAlert PotatoUpdater CoreTest GameFileUnpackTest GameTest ReplayTest
+        run: cmake --build build --preset conan-clang-release --target PotatoAlert PotatoUpdater CoreTest GameFileUnpackTest GameTest ReplayTest
 
       - name: Run CTest
-        working-directory: ${{env.GITHUB_WORKSPACE}}/build
+        working-directory: ${{env.GITHUB_WORKSPACE}}/build/clang/Release
         env:
           CTEST_OUTPUT_ON_FAILURE: 1
         run: ctest
 
       - name: Create Release Archive
         run: |
-          7z a -mx9 -r ${{ matrix.zipfile }} .\build\bin\*
+          7z a -mx9 -r ${{ env.zipfile }} .\build\clang\Release\bin\*
 
       - name: Create Installer
-        working-directory: ${{env.GITHUB_WORKSPACE}}/build
+        working-directory: ${{env.GITHUB_WORKSPACE}}/build/clang/Release
         run: cpack
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.zipfile }}
-          path: ${{ matrix.zipfile }}
+          name: ${{ env.zipfile }}
+          path: ${{ env.zipfile }}
 
       - name: Create Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           prerelease: true
           files: |
-            ${{ matrix.zipfile }}
-            build/PotatoAlert-*.msi
+            ${{ env.zipfile }}
+            build/clang/Release/PotatoAlert-*.msi
 
   build-linux:
     name: Build Linux Qt6
-    strategy:
-      matrix:
-        include:
-          - gcc-version: 14
+    env:
+      gcc-version: 14
 
     runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Setup Conan
+        run: |
+          pip install conan
+          conan profile detect
+
       - name: Setup Ninja
         run: sudo apt install -y ninja-build
 
-      - name: Ninja Version
-        run: ninja --version
-
       - name: Install Dependencies
         run: >
           sudo apt install -y
@@ -143,30 +156,45 @@ jobs:
           version: 6.7.2
           cache: true
 
+      - name: Conan Version
+        run: conan --version
+
       - name: CMake Version
         run: cmake --version
 
       - name: GCC Version
-        run: g++-${{ matrix.gcc-version }} --version
+        run: g++-${{ env.gcc-version }} --version
+
+      - name: Ninja Version
+        run: ninja --version
+
+      - name: Cache Conan Dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.conan2
+          key: hashFiles('**/conanfile.py')
+
+      - name: Run Conan
+        run: conan build . --build=missing --profile:all=./.github/conan/profiles/linux-gcc
 
       - name: Run CMake
         env:
-          CC: gcc-${{ matrix.gcc-version }}
-          CXX: g++-${{ matrix.gcc-version }}
-        run: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DPA_SUBMIT_URL=${{ secrets.PA_SUBMIT_URL }} -DPA_LOOKUP_URL=${{ secrets.PA_LOOKUP_URL }}
+          CC: gcc-${{ env.gcc-version }}
+          CXX: g++-${{ env.gcc-version }}
+        run: cmake -S . -DPA_SUBMIT_URL=${{ secrets.PA_SUBMIT_URL }} -DPA_LOOKUP_URL=${{ secrets.PA_LOOKUP_URL }} --preset conan-gcc-release
 
       - name: Run Build
-        run: cmake --build build --config Release --target PotatoAlert CoreTest GameFileUnpackTest GameTest ReplayTest
+        run: cmake --build build --preset conan-gcc-release --target PotatoAlert CoreTest GameFileUnpackTest GameTest ReplayTest
 
       - name: Run CTest
-        working-directory: build
+        working-directory: build/gcc/Release
         env:
           CTEST_OUTPUT_ON_FAILURE: 1
         run: ctest
 
       - name: Create Release Archive
         run: |
-          7z a -mx9 -r PotatoAlert_linux.zip ./build/bin/*
+          7z a -mx9 -r PotatoAlert_linux.zip ./build/gcc/Release/bin/*
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4

Client/CMakeLists.txt

@@ -53,8 +53,12 @@ if (NOT Qt6_FOUND)
     find_package(Qt5 COMPONENTS Core Network Widgets REQUIRED)
 endif()
 
+find_package(ctre REQUIRED)
+find_package(fmt REQUIRED)
+find_package(tinyxml2 REQUIRED)
+
 set_target_properties(Client PROPERTIES CXX_STANDARD 23 CXX_STANDARD_REQUIRED true)
-target_link_libraries(Client PRIVATE ctre tinyxml2 Win32)
+target_link_libraries(Client PRIVATE ctre::ctre tinyxml2::tinyxml2 Win32)
 target_link_libraries(Client PUBLIC Core GameFileUnpack ReplayParser fmt::fmt Qt::Core Qt::Network Qt::Widgets)
 target_include_directories(Client PUBLIC ${PROJECT_SOURCE_DIR}/Resources include)
 include(CompilerFlags)

Client/include/Client/AppDirectories.hpp

@@ -52,7 +52,7 @@ struct AppDirectories
 		const bool exists = std::filesystem::exists(dir, ec);
 		if (ec)
 		{
-			fmt::println(stderr, STR("Failed to check if app dir '{}' exists, reason: '{}'"), dir, ec);
+			fmt::println(stderr, "Failed to check if app dir '{}' exists, reason: '{}'", dir, ec);
 			Core::ExitCurrentProcessWithError((uint32_t)ec.value());
 		}
 
@@ -61,7 +61,7 @@ struct AppDirectories
 			std::filesystem::create_directories(dir, ec);
 			if (ec)
 			{
-				fmt::println(stderr, STR("Failed to create app dir '{}', reason: '{}'"), dir, ec);
+				fmt::println(stderr, "Failed to create app dir '{}', reason: '{}'", dir, ec);
 				Core::ExitCurrentProcessWithError((uint32_t)ec.value());
 			}
 		}

Client/src/Game.cpp

@@ -14,7 +14,7 @@
 #include "Core/Version.hpp"
 #include "Core/Xml.hpp"
 
-#include <ctre/ctre.hpp>
+#include <ctre.hpp>
 
 #include <filesystem>
 #include <ranges>

Core/CMakeLists.txt

@@ -73,9 +73,20 @@ if (NOT Qt6_FOUND)
     find_package(Qt5 COMPONENTS Core Widgets REQUIRED)
 endif()
 
+find_package(ctre REQUIRED)
+find_package(date REQUIRED)
+find_package(fmt REQUIRED)
+find_package(OpenSSL REQUIRED)
+find_package(RapidJSON REQUIRED)
+find_package(spdlog REQUIRED)
+find_package(SQLite3 REQUIRED)
+find_package(tinyxml2 REQUIRED)
+find_package(zip REQUIRED)
+find_package(ZLIB REQUIRED)
+
 set_target_properties(Core PROPERTIES CXX_STANDARD 23 CXX_STANDARD_REQUIRED true)
-target_link_libraries(Core PRIVATE ctre date::date sqlite3 OpenSSL zip ZLIB::ZLIB)
-target_link_libraries(Core PUBLIC Qt::Core Qt::Widgets RapidJson fmt::fmt spdlog tinyxml2)
+target_link_libraries(Core PRIVATE ctre::ctre date::date SQLite::SQLite3 openssl::openssl zip::zip ZLIB::ZLIB)
+target_link_libraries(Core PUBLIC Qt::Core Qt::Widgets rapidjson fmt::fmt spdlog::spdlog_header_only tinyxml2::tinyxml2)
 target_include_directories(Core PUBLIC include)
 include(CompilerFlags)
 SetCompilerFlags(Core)

Core/include/Core/String.hpp

@@ -81,7 +81,7 @@ struct fmt::formatter<StringWrap, wchar_t>
 		return ctx.begin();
 	}
 
-	auto format(const StringWrap& val, buffer_context<wchar_t>& ctx) const -> buffer_context<wchar_t>::iterator
+	auto format(const StringWrap& val, buffered_context<wchar_t>& ctx) const -> buffered_context<wchar_t>::iterator
 	{
 		if (const PotatoAlert::Core::Result<size_t> length = PotatoAlert::Core::Utf8ToWide(val.Str))
 		{

Core/src/Version.cpp

@@ -4,7 +4,7 @@
 #include "Core/String.hpp"
 #include "Core/Version.hpp"
 
-#include <ctre/ctre.hpp>
+#include <ctre.hpp>
 
 #include <string>
 

Core/src/Zip.cpp

@@ -6,7 +6,7 @@
 #include "Core/Zip.hpp"
 
 PA_SUPPRESS_WARN_BEGIN
-#include <zip.h>
+#include <zip/zip.h>
 PA_SUPPRESS_WARN_END
 
 #include <cstdint>
@@ -138,5 +138,5 @@ uint64_t Zip::SizeEntry() const
 
 int Zip::EntryCount() const
 {
-	return zip_total_entries(UnwrapHandle<zip_t*>(m_handle));
+	return zip_entries_total(UnwrapHandle<zip_t*>(m_handle));
 }

ReplayParser/CMakeLists.txt

@@ -22,7 +22,8 @@ target_sources(
 )
 set_target_properties(ReplayParser PROPERTIES CXX_STANDARD 23 CXX_STANDARD_REQUIRED true)
 target_include_directories(ReplayParser PUBLIC include)
-target_link_libraries(ReplayParser PUBLIC tinyxml2 Core ReplayAnalyzer)
+find_package(tinyxml2 REQUIRED)
+target_link_libraries(ReplayParser PUBLIC tinyxml2::tinyxml2 Core ReplayAnalyzer)
 include(CompilerFlags)
 SetCompilerFlags(ReplayParser)
 

Test/CoreTest/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_executable(CoreTest CoreTest.cpp)
+find_package(Catch2 REQUIRED)
 target_link_libraries(CoreTest PRIVATE Core Catch2::Catch2WithMain)
 set_target_properties(CoreTest
     PROPERTIES

Test/GameFileUnpackTest/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_executable(GameFileUnpackTest GameFileUnpackTest.cpp)
+find_package(Catch2 REQUIRED)
 target_link_libraries(GameFileUnpackTest PRIVATE Core Catch2::Catch2WithMain GameFileUnpack)
 set_target_properties(GameFileUnpackTest
     PROPERTIES

Test/GameTest/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_executable(GameTest GameTest.cpp)
+find_package(Catch2 REQUIRED)
 target_link_libraries(GameTest PRIVATE Client Core Catch2::Catch2WithMain)
 set_target_properties(GameTest
     PROPERTIES

Test/PythonTest/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_executable(PythonTest PythonTest.cpp)
+find_package(Catch2 REQUIRED)
 target_link_libraries(PythonTest PRIVATE Core Catch2::Catch2WithMain)
 set_target_properties(PythonTest
     PROPERTIES

Test/ReplayTest/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_executable(ReplayTest ReplayTest.cpp)
+find_package(Catch2 REQUIRED)
 target_link_libraries(ReplayTest PRIVATE Core Catch2::Catch2WithMain ReplayParser)
 set_target_properties(ReplayTest
     PROPERTIES