From b2beaa4b930458ef6e26e528300ff0ce2e9d169a Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 13 Dec 2018 10:17:16 +0100
Subject: [PATCH] [Jenkins] Fix envinf1 builds.
---
Jenkinsfile | 6 ++++--
scripts/cmake/Find.cmake | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b5d18cba1bc..f4b13c8d906 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 9bff63e4d8f..c26e440319e 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()
--
GitLab