Skip to content

Commit 2058fec

Browse files
committed
Update Conan build settings
1 parent e4cdd8b commit 2058fec

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

build.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
if __name__ == "__main__":
44
builder = ConanMultiPackager()
55
builder.add_common_builds()
6+
builder.remove_build_if(
7+
lambda build: build.settings["compiler"] == "gcc" and build.settings[
8+
"compiler.libcxx"] == "libstdc++")
69
builder.run()

script/ci_build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ conan profile new default --detect
1111
if [[ "${CXX}" == clang* ]]
1212
then
1313
export CXXFLAGS="-stdlib=libc++"
14+
conan profile update settings.compiler.libcxx=libc++ default
1415
else
1516
conan profile update settings.compiler.libcxx=libstdc++11 default
1617
fi
@@ -21,6 +22,7 @@ conan install \
2122
--build=missing \
2223
-g cmake_find_package \
2324
-g cmake_paths \
25+
-s compiler.cppstd=17 \
2426
..
2527

2628
cmake -DCMAKE_BUILD_TYPE=Release ..

script/conan_build.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
set -ex
44

55
export CONAN_ARCHS="x86_64"
6-
export CONAN_BUILD_TYPES=Release
6+
export CONAN_BUILD_TYPES="Release"
7+
export CONAN_CPPSTDS="17"
8+
export CONAN_PURE_C="False"
9+
export CONAN_BUILD_POLICY="missing"
710

811
pip install -U conan conan_package_tools
912
python build.py

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ find_package(trompeloeil REQUIRED)
44

55
function(add_test_suite name)
66
add_executable(${name} ${name}.cpp)
7-
target_link_libraries(${name} PRIVATE Catch2::Catch2WithMain trompeloeil::trompeloeil ScopeGuard)
7+
target_link_libraries(${name} PRIVATE ScopeGuard Catch2::Catch2WithMain trompeloeil::trompeloeil)
88
add_test(${name} ${name})
99
endfunction()
1010

0 commit comments

Comments
 (0)