diff --git a/Jenkinsfile b/Jenkinsfile index b5d18cba1bc95d887673d4eee50ea5185830db06..f4b13c8d9066ae49e9f49158e564f44c1f54b81f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -177,7 +177,8 @@ pipeline { configure { cmakeOptions = '-DOGS_BUILD_UTILS=ON ' + - '-DBUILD_SHARED_LIBS=ON ' + '-DBUILD_SHARED_LIBS=ON ' + + '-DOGS_USE_CONAN=OFF ' env = 'envinf1/cli.sh' } build { @@ -210,7 +211,8 @@ pipeline { cmakeOptions = '-DOGS_BUILD_UTILS=ON ' + '-DBUILD_SHARED_LIBS=ON ' + - '-DOGS_USE_PETSC=ON ' + '-DOGS_USE_PETSC=ON ' + + '-DOGS_USE_CONAN=OFF ' env = 'envinf1/petsc.sh' } build { diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index 9bff63e4d8fab073b767020353a0efaef99dff1b..c26e440319e670cab3579ad0f669e9ae45244212 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -60,7 +60,7 @@ find_program(MODULE_CMD modulecmd ###################### ### Find libraries ### ###################### -if(NOT OGS_USE_CONAN) +if(NOT OGS_USE_CONAN OR NOT CONAN_CMD) find_package(Boost REQUIRED) include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) endif()