VP
/
TGC-VP
6
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

fixes CentOS7 build and RL8 image name

This commit is contained in:
Eyck Jentzsch 2023-12-02 11:12:28 +01:00
parent 833b12752a
commit cb4e04b634
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -66,7 +66,6 @@ boost:without_type_erasure=True
boost:without_wave=True boost:without_wave=True
) )
set(B2_VERSION 4.9.6)
set(CONAN_PACKAGE_LIST set(CONAN_PACKAGE_LIST
fmt/8.0.1 fmt/8.0.1
spdlog/1.9.2 spdlog/1.9.2
@ -114,12 +113,13 @@ conan_check()
conan_add_remote(NAME minres URL https://git.minres.com/api/packages/Tooling/conan) conan_add_remote(NAME minres URL https://git.minres.com/api/packages/Tooling/conan)
# Boost on CentOS 7 quirks: the b2 of conan-center is build against a newer libstdc++ and therefore does not run # Boost on CentOS 7 quirks: the b2 of conan-center is build against a newer libstdc++ and therefore does not run
# with the oooooold libs on CentOS 7. Therefore we build our own version of b2 if it is not there # with the oooooold libs on CentOS 7. Therefore we build our own version of b2 if it is not there
set(B2_META $ENV{HOME}/.conan/data/b2/${B2_VERSION}/_/_/metadata.json) execute_process(COMMAND bash -c "conan search -r all b2 | tail -1" OUTPUT_VARIABLE B2_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
set(B2_META $ENV{HOME}/.conan/data/${B2_VERSION}/_/_/metadata.json)
if(DEFINED ENV{CONAN_USER_HOME}) if(DEFINED ENV{CONAN_USER_HOME})
set(B2_META $ENV{CONAN_USER_HOME}/.conan/data/b2/${B2_VERSION}/_/_/metadata.json) set(B2_META $ENV{CONAN_USER_HOME}/.conan/data/${B2_VERSION}/_/_/metadata.json)
endif() endif()
if(NOT EXISTS ${B2_META}) if(NOT EXISTS ${B2_META})
conan_configure(REQUIRES b2/${B2_VERSION}) conan_configure(REQUIRES ${B2_VERSION})
conan_cmake_autodetect(settings) conan_cmake_autodetect(settings)
conan_cmake_install(PATH_OR_REFERENCE . BUILD b2 SETTINGS ${settings}) conan_cmake_install(PATH_OR_REFERENCE . BUILD b2 SETTINGS ${settings})
endif() endif()

2
Jenkinsfile vendored
View File

@ -87,7 +87,7 @@ pipeline {
} }
} }
stage('RockyLinux8'){ stage('RockyLinux8'){
agent {docker { image 'rocky8' } } agent {docker { image 'rockylinux8' } }
stages { stages {
stage('Checkout on Ubuntu') { steps {checkout_tgc_vp()}} stage('Checkout on Ubuntu') { steps {checkout_tgc_vp()}}
stage('Build') { steps {build_tgc_vp()} stage('Build') { steps {build_tgc_vp()}