File tree Expand file tree Collapse file tree 4 files changed +10
-2
lines changed
Expand file tree Collapse file tree 4 files changed +10
-2
lines changed Original file line number Diff line number Diff line change 33if __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 ()
Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ conan profile new default --detect
1111if [[ " ${CXX} " == clang* ]]
1212then
1313 export CXXFLAGS=" -stdlib=libc++"
14+ conan profile update settings.compiler.libcxx=libc++ default
1415else
1516 conan profile update settings.compiler.libcxx=libstdc++11 default
1617fi
@@ -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
2628cmake -DCMAKE_BUILD_TYPE=Release ..
Original file line number Diff line number Diff line change 33set -ex
44
55export 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
811pip install -U conan conan_package_tools
912python build.py
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ find_package(trompeloeil REQUIRED)
44
55function (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} )
99endfunction ()
1010
You can’t perform that action at this time.
0 commit comments