diff --git a/Jenkinsfile b/Jenkinsfile index 761eb3d1f71343ce01637e8e5c6e7361edbe5d0f..b07005f1dedd72048fd8b1ec8a85cbde74e293dc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -230,7 +230,8 @@ pipeline { publishReports { } warnings(canResolveRelativePaths: false, consoleParsers: [[parserName: 'MSBuild']], - messagesPattern: '.*\\.conan.*') + excludePattern: '.*\\.conan.*', + messagesPattern: '.*QVTK.*') } failure { dir('build') { deleteDir() } diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 8a578e8f489fbd069a48bfcfb031fd7b733b7584..c1fa22c0fbaad940b635a70f9260a1e8eeba1c34 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -102,3 +102,8 @@ conan_cmake_run(REQUIRES ${CONAN_REQUIRES} UPDATE BUILD ${OGS_CONAN_BUILD} ) + +if(NOT ${OGS_CONAN_BUILD} MATCHES "never|always|missing") + message(STATUS "Warning: Resetting CMake variable OGS_CONAN_BUILD to its default value of 'missing'") + set(OGS_CONAN_BUILD "missing" CACHE INTERNAL "") +endif()