SystemC/SystemC-Components-Test
8
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

updates C++ language level

Browse Source
This commit is contained in:
Eyck Jentzsch
2025-11-08 19:15:25 +01:00
parent eae0fc24c8
commit 8b5c062847
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakePresets.json
View File

@@ -15,7 +15,7 @@
"binaryDir": "${sourceDir}/build/${presetName}", "binaryDir": "${sourceDir}/build/${presetName}",
"cacheVariables": { "cacheVariables": {
"CMAKE_POLICY_DEFAULT_CMP0091": "NEW", "CMAKE_POLICY_DEFAULT_CMP0091": "NEW",
"CMAKE_CXX_STANDARD": "17", "CMAKE_CXX_STANDARD": "20",
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
"CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "cmake-conan/conan_provider.cmake", "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "cmake-conan/conan_provider.cmake",

6
Jenkinsfile vendored
View File

@@ -55,7 +55,7 @@ pipeline {
stage('ubuntu-22.04') { stage('ubuntu-22.04') {
agent {docker { agent {docker {
image 'ubuntu-22.04' 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 { stages {
stage('Checkout') { steps { checkout_project() }} stage('Checkout') { steps { checkout_project() }}
@@ -65,13 +65,13 @@ pipeline {
stage('rockylinux8') { stage('rockylinux8') {
agent {docker { agent {docker {
image 'rockylinux8' image 'rockylinux8'
args ' -e CONAN_HOME=/var/jenkins_home/workspace/conan-rocky8' args ' -e CONAN_HOME=/var/jenkins_home/workspace/conan-rocky8-cxx20'
} } } }
stages { stages {
stage('Checkout') { steps { checkout_project() }} stage('Checkout') { steps { checkout_project() }}
stage('Build & test') { steps { build_n_test_project() }} stage('Build & test') { steps { build_n_test_project() }}
} }
} qq }
} }
} }
} }

2
conanfile.py
View File

@@ -27,7 +27,7 @@ class Pkg(ConanFile):
"boost/*:without_python": "True", "boost/*:without_python": "True",
"boost/*:without_random": "True", "boost/*:without_random": "True",
"boost/*:without_regex": "True", "boost/*:without_regex": "True",
"boost/*:without_stacktrace": "True", "boost/*:without_stacktrace": "False",
"boost/*:without_test": "True", "boost/*:without_test": "True",
"boost/*:without_timer": "True", "boost/*:without_timer": "True",
"boost/*:without_type_erasure": "True", "boost/*:without_type_erasure": "True",