From 542186bff4ad049fac37f85bee584f6b42d29869 Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Fri, 17 Apr 2026 11:17:10 +0200 Subject: [PATCH] Fix profiles --- ConanProfiles/Toolchains/ipo.ini | 2 ++ ConanProfiles/clang | 3 +-- ConanProfiles/clang_asan | 3 --- ConanProfiles/clang_coverage | 3 --- ConanProfiles/msvc | 3 +-- ConanProfiles/msvc_asan | 3 --- 6 files changed, 4 insertions(+), 13 deletions(-) create mode 100644 ConanProfiles/Toolchains/ipo.ini 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 8892d03..3691ac0 100644 --- a/ConanProfiles/clang +++ b/ConanProfiles/clang @@ -12,6 +12,7 @@ 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 @@ -23,8 +24,6 @@ tools.build:compiler_executables={"c": "clang", "cpp": "clang++"} tools.cmake.cmaketoolchain:generator=Ninja -tools.info.package_id:confs=["tools.build:cxxflags", "tools.build:cflags"] - [tool_requires] !cmake/*: cmake/[>=4.2] diff --git a/ConanProfiles/clang_asan b/ConanProfiles/clang_asan index 71d050f..fbbce46 100644 --- a/ConanProfiles/clang_asan +++ b/ConanProfiles/clang_asan @@ -11,7 +11,6 @@ build_type=Debug [conf] tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/Toolchains/ccache.cmake -tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/Toolchains/ipo.cmake tools.system.package_manager:mode=install tools.system.package_manager:sudo=True @@ -26,8 +25,6 @@ tools.cmake.cmaketoolchain:generator=Ninja tools.build:compiler_executables={"c": "clang", "cpp": "clang++"} -tools.info.package_id:confs=["tools.build:cxxflags", "tools.build:cflags"] - [tool_requires] !cmake/*: cmake/[>=4.2] diff --git a/ConanProfiles/clang_coverage b/ConanProfiles/clang_coverage index 1e07b61..55d7c5a 100644 --- a/ConanProfiles/clang_coverage +++ b/ConanProfiles/clang_coverage @@ -11,7 +11,6 @@ build_type=Debug [conf] tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/Toolchains/ccache.cmake -tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/Toolchains/ipo.cmake tools.system.package_manager:mode=install tools.system.package_manager:sudo=True @@ -23,8 +22,6 @@ tools.cmake.cmaketoolchain:generator=Ninja tools.build:compiler_executables={"c": "clang", "cpp": "clang++"} -tools.info.package_id:confs=["tools.build:cxxflags", "tools.build:cflags"] - [tool_requires] !cmake/*: cmake/[>=4.2] diff --git a/ConanProfiles/msvc b/ConanProfiles/msvc index f219d0c..a1b2415 100644 --- a/ConanProfiles/msvc +++ b/ConanProfiles/msvc @@ -11,12 +11,11 @@ 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", "/Zc:throwingNew"] -tools.info.package_id:confs=["tools.build:cxxflags", "tools.build:cflags"] - [tool_requires] !cmake/*: cmake/[>=4.2] diff --git a/ConanProfiles/msvc_asan b/ConanProfiles/msvc_asan index 5c3dde3..a1c9fdb 100644 --- a/ConanProfiles/msvc_asan +++ b/ConanProfiles/msvc_asan @@ -10,13 +10,10 @@ build_type=Debug [conf] tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/Toolchains/ccache.cmake -tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/Toolchains/ipo.cmake tools.build:cflags=["/Zc:preprocessor", "/Zc:__STDC__", "/D_CRT_DECLARE_NONSTDC_NAMES=1", "/fsanitize=address"] tools.build:cxxflags=["/Zc:preprocessor", "/permissive-", "/Zc:__cplusplus", "/Zc:enumTypes", "/Zc:templateScope", "/Zc:throwingNew", "/fsanitize=address"] -tools.info.package_id:confs=["tools.build:cxxflags", "tools.build:cflags"] - [tool_requires] !cmake/*: cmake/[>=4.2]