diff --git a/Jenkinsfile b/Jenkinsfile index 2358cce9f1207399b0f67024fbea4da36d6ea5fb..d705286ffb1c94c2960aa1debf47c60fe4718a3f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -248,6 +248,7 @@ pipeline { cmakeOptions = "-DBUILD_SHARED_LIBS=${build_shared} " + '-DOGS_CONAN_BUILD=outdated ' + + '-DOGS_CONAN_BUILD_TYPE=Release ' + '-DOGS_CPU_ARCHITECTURE=generic ' config = 'Debug' } diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 78a3095a3d7324c6c8cce6015ebfabedf31f4c35..c28bb036dfffa3904e0eccb75362713a56ceca9e 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -27,7 +27,7 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake) set(CONAN_REQUIRES boost/1.66.0@conan/stable eigen/3.3.4@conan/stable - vtk/8.2.0@bilke/testing + vtk/8.2.0@bilke/stable CACHE INTERNAL "" ) @@ -127,6 +127,12 @@ else() message(STATUS "Conan: Skipping update step.") endif() +if(DEFINED OGS_CONAN_BUILD_TYPE) + set(CONAN_BUILD_TYPE ${OGS_CONAN_BUILD_TYPE}) +else() + set(CONAN_BUILD_TYPE ${CMAKE_BUILD_TYPE}) +endif() + if(MSVC) set(CC_CACHE $ENV{CC}) set(CXX_CACHE $ENV{CXX}) @@ -142,6 +148,7 @@ conan_cmake_run( BUILD ${OGS_CONAN_BUILD} IMPORTS ${CONAN_IMPORTS} GENERATORS virtualrunenv + BUILD_TYPE ${CONAN_BUILD_TYPE} ) if(MSVC) set(ENV{CC} ${CC_CACHE}) # Restore vars