Skip to content

Commit 1071f8d

Browse files
Layer conan profile addons on top of base profile (#631)
CONAN_HOST_PROFILE is an ordered list where later profiles override earlier ones. auto-cmake is the base host profile generated from the CMake toolchain, and the clang/libstdc++ profile files are addons meant to extend it. They were listed before auto-cmake, so the generated base could override the addon settings. Put auto-cmake first so the custom addon profiles apply on top of it as intended.
1 parent 2344e34 commit 1071f8d

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

.github/files/CMakeUserPresets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
"CMAKE_CXX_FLAGS": "$env{PRESET_CXX_FLAGS_LIBCPP_FOR_CLANG}",
177177
"CMAKE_EXE_LINKER_FLAGS": "$env{PRESET_LINKER_FLAGS_LIBCPP_FOR_CLANG}",
178178
"CMAKE_SHARED_LINKER_FLAGS": "$env{PRESET_LINKER_FLAGS_LIBCPP_FOR_CLANG}",
179-
"CONAN_HOST_PROFILE": "${sourceDir}/conan-profile-clang-with-libc++;auto-cmake"
179+
"CONAN_HOST_PROFILE": "auto-cmake;${sourceDir}/conan-profile-clang-with-libc++"
180180
}
181181
},
182182
{
@@ -188,7 +188,7 @@
188188
"cacheVariables": {
189189
"CMAKE_EXE_LINKER_FLAGS": "-stdlib=libstdc++ -L$penv{HOMEBREW_PREFIX}/opt/gcc@$penv{GCC_MAJOR_VERSION}/lib/gcc/$penv{GCC_MAJOR_VERSION}",
190190
"CMAKE_SHARED_LINKER_FLAGS": "-stdlib=libstdc++ -L$penv{HOMEBREW_PREFIX}/opt/gcc@$penv{GCC_MAJOR_VERSION}/lib/gcc/$penv{GCC_MAJOR_VERSION}",
191-
"CONAN_HOST_PROFILE": "${sourceDir}/conan-profile-gcc-libstd++-for-clang;auto-cmake"
191+
"CONAN_HOST_PROFILE": "auto-cmake;${sourceDir}/conan-profile-gcc-libstd++-for-clang"
192192
}
193193
},
194194
{

0 commit comments

Comments
 (0)