From e326415f12f48a5b581f423deba143fcd733744d Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Thu, 16 Apr 2026 22:19:28 +0000 Subject: [PATCH] Maintenance (#13) Reviewed-on: https://git.romainboullard.com/BigfootDev/ConanPackages/pulls/13 Co-authored-by: Romain BOULLARD Co-committed-by: Romain BOULLARD --- .gitea/workflows/ci.yml | 26 ++++++++++++++++++- ConanProfiles/Toolchains/ipo.cmake | 5 ++++ ConanProfiles/Toolchains/ipo.ini | 2 ++ ConanProfiles/clang | 4 ++- ConanProfiles/msvc | 2 ++ .../all/test_package/CMakeLists.txt | 2 +- 6 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 ConanProfiles/Toolchains/ipo.cmake create mode 100644 ConanProfiles/Toolchains/ipo.ini diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index df96898..b10ab33 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -59,6 +59,9 @@ jobs: with: submodules: recursive + - name: Reset ccache stats + run: ccache --zero-stats + - name: Run Conan packaging run: | echo "Building ${{ matrix.package.name }}@${{ matrix.package.version }}" @@ -76,6 +79,9 @@ jobs: conan upload ${{ matrix.package.name }}/${{ matrix.package.version }}@bigfootdev/${{ env.BRANCH_NAME }} \ --only-recipe --remote=bigfootpackages + - name: Show ccache stats + run: ccache --show-stats + conan-packages-tier2: needs: conan-packages-tier1 runs-on: ubuntu-latest @@ -108,6 +114,9 @@ jobs: with: submodules: recursive + - name: Reset ccache stats + run: ccache --zero-stats + - name: Run Conan packaging run: | echo "Building ${{ matrix.package.name }}@${{ matrix.package.version }}" @@ -125,6 +134,9 @@ jobs: conan upload ${{ matrix.package.name }}/${{ matrix.package.version }}@bigfootdev/${{ env.BRANCH_NAME }} \ --only-recipe --remote=bigfootpackages + - name: Show ccache stats + run: ccache --show-stats + conan-packages-tier3: needs: conan-packages-tier2 runs-on: ubuntu-latest @@ -153,6 +165,9 @@ jobs: with: submodules: recursive + - name: Reset ccache stats + run: ccache --zero-stats + - name: Run Conan packaging run: | echo "Building ${{ matrix.package.name }}@${{ matrix.package.version }}" @@ -170,6 +185,9 @@ jobs: conan upload ${{ matrix.package.name }}/${{ matrix.package.version }}@bigfootdev/${{ env.BRANCH_NAME }} \ --only-recipe --remote=bigfootpackages + - name: Show ccache stats + run: ccache --show-stats + conan-packages-tier4: needs: conan-packages-tier3 runs-on: ubuntu-latest @@ -197,6 +215,9 @@ jobs: with: submodules: recursive + - name: Reset ccache stats + run: ccache --zero-stats + - name: Run Conan packaging run: | echo "Building ${{ matrix.package.name }}@${{ matrix.package.version }}" @@ -212,4 +233,7 @@ jobs: CONAN_LOGIN_USERNAME=${ARTIFACTORY_USER} \ CONAN_PASSWORD=${ARTIFACTORY_PASSWORD} \ conan upload ${{ matrix.package.name }}/${{ matrix.package.version }}@bigfootdev/${{ env.BRANCH_NAME }} \ - --only-recipe --remote=bigfootpackages \ No newline at end of file + --only-recipe --remote=bigfootpackages + + - name: Show ccache stats + run: ccache --show-stats \ No newline at end of file diff --git a/ConanProfiles/Toolchains/ipo.cmake b/ConanProfiles/Toolchains/ipo.cmake new file mode 100644 index 0000000..7e83475 --- /dev/null +++ b/ConanProfiles/Toolchains/ipo.cmake @@ -0,0 +1,5 @@ +include_guard() + +set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) + +set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE) \ No newline at end of file diff --git a/ConanProfiles/Toolchains/ipo.ini b/ConanProfiles/Toolchains/ipo.ini new file mode 100644 index 0000000..bf155da --- /dev/null +++ b/ConanProfiles/Toolchains/ipo.ini @@ -0,0 +1,2 @@ +[built-in options] +b_lto = true \ No newline at end of file diff --git a/ConanProfiles/clang b/ConanProfiles/clang index fb843d8..8f909df 100644 --- a/ConanProfiles/clang +++ b/ConanProfiles/clang @@ -2,7 +2,7 @@ os=Linux arch=x86_64 compiler=clang -compiler.version=20 +compiler.version=22 compiler.libcxx=libstdc++11 compiler.cppstd=20 compiler.cstd=17 @@ -11,6 +11,8 @@ build_type=Release [conf] tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/Toolchains/ccache.cmake +tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/Toolchains/ipo.cmake +tools.meson.mesontoolchain:extra_machine_files+={{profile_dir}}/Toolchains/ipo.ini tools.system.package_manager:mode=install tools.system.package_manager:sudo=True diff --git a/ConanProfiles/msvc b/ConanProfiles/msvc index 049a6b8..5c0d4aa 100644 --- a/ConanProfiles/msvc +++ b/ConanProfiles/msvc @@ -10,6 +10,8 @@ build_type=Release [conf] tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/Toolchains/ccache.cmake +tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/Toolchains/ipo.cmake +tools.meson.mesontoolchain:extra_machine_files+={{profile_dir}}/Toolchains/ipo.ini tools.build:cflags=["/Zc:preprocessor", "/Zc:__STDC__", "/D_CRT_DECLARE_NONSTDC_NAMES=1"] tools.build:cxxflags=["/Zc:preprocessor", "/permissive-", "/Zc:__cplusplus", "/Zc:enumTypes", "/Zc:templateScope"] diff --git a/vulkan-validationlayers/all/test_package/CMakeLists.txt b/vulkan-validationlayers/all/test_package/CMakeLists.txt index f968d5c..fe4071b 100644 --- a/vulkan-validationlayers/all/test_package/CMakeLists.txt +++ b/vulkan-validationlayers/all/test_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.10) project(test_package LANGUAGES CXX) find_package(vulkan-validationlayers REQUIRED CONFIG)