diff --git a/CMakePresets.json b/CMakePresets.json index 6bdc642..0a556d8 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -15,7 +15,7 @@ "binaryDir": "${sourceDir}/build/${presetName}", "cacheVariables": { "CMAKE_POLICY_DEFAULT_CMP0091": "NEW", - "CMAKE_CXX_STANDARD": "17", + "CMAKE_CXX_STANDARD": "20", "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "cmake-conan/conan_provider.cmake", diff --git a/Jenkinsfile b/Jenkinsfile index 42bc1d8..6b04247 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -55,7 +55,7 @@ pipeline { stage('ubuntu-22.04') { agent {docker { image 'ubuntu-22.04' - args ' -e CONAN_HOME=/var/jenkins_home/workspace/conan-jammy' + args ' -e CONAN_HOME=/var/jenkins_home/workspace/conan-jammy-cxx20' } } stages { stage('Checkout') { steps { checkout_project() }} @@ -65,13 +65,13 @@ pipeline { stage('rockylinux8') { agent {docker { image 'rockylinux8' - args ' -e CONAN_HOME=/var/jenkins_home/workspace/conan-rocky8' + args ' -e CONAN_HOME=/var/jenkins_home/workspace/conan-rocky8-cxx20' } } stages { stage('Checkout') { steps { checkout_project() }} stage('Build & test') { steps { build_n_test_project() }} } - } + qq } } } } diff --git a/conanfile.py b/conanfile.py index edfda26..ba167cf 100644 --- a/conanfile.py +++ b/conanfile.py @@ -27,7 +27,7 @@ class Pkg(ConanFile): "boost/*:without_python": "True", "boost/*:without_random": "True", "boost/*:without_regex": "True", - "boost/*:without_stacktrace": "True", + "boost/*:without_stacktrace": "False", "boost/*:without_test": "True", "boost/*:without_timer": "True", "boost/*:without_type_erasure": "True",