Merge pull request #2392 from bilke/cleanup-cmake-out

Cleanup cmake output
ufz · Mar 1, 2019 · 322f4c6 · 322f4c6
2 parents de33efd + af44adc
commit 322f4c6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -347,6 +347,9 @@ if( BUILD_TESTING AND NOT IS_SUBPROJECT )
     endif()
 endif()
 
+file(WRITE ${PROJECT_BINARY_DIR}/disabled-tests.log "${DISABLED_TESTS_LOG}")
+unset(DISABLED_TESTS_LOG CACHE) # Don't write to CMakeCache.txt
+
 # The configuration must be called from the source dir and not BaseLib/.
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/BaseLib/BuildInfo.cpp.in"
     "${CMAKE_CURRENT_BINARY_DIR}/BaseLib/BuildInfo.cpp" @ONLY)

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -77,7 +77,7 @@ pipeline {
               }
             }
           }
-          if(!stage_required.build || !stage_required.full) {
+          if(!(stage_required.build || stage_required.full)) {
             currentBuild.result='UNSTABLE'
           }
         }

diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
@@ -25,16 +25,14 @@ endif()
 include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake)
 
 set(CONAN_REQUIRES
-    boost_dynamic_bitset/1.66.0@bincrafters/stable
-    boost_optional/1.66.0@bincrafters/stable
-    boost_property_tree/1.66.0@bincrafters/stable
+    boost/1.66.0@conan/stable
     Eigen3/3.3.4@bilke/stable
     VTK/8.1.1@bilke/stable
     CACHE INTERNAL ""
 )
 
 set(CONAN_OPTIONS
-    Boost:header_only=True
+    boost:header_only=True
     Qt:qtxmlpatterns=True
     VTK:minimal=True
     VTK:ioxml=True

diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
@@ -75,31 +75,31 @@ function (AddTest)
     if(${AddTest_REQUIREMENTS})
         # message(STATUS "Enabling test ${AddTest_NAME}.")
     else()
-        message(STATUS "Requirement ${AddTest_REQUIREMENTS} not met! Disabling test ${AddTest_NAME}.")
+        set(DISABLED_TESTS_LOG "${DISABLED_TESTS_LOG}\nRequirement ${AddTest_REQUIREMENTS} not met! Disabling test ${AddTest_NAME}." CACHE INTERNAL "")
         return()
     endif()
 
     if(AddTest_WRAPPER STREQUAL "time")
         if(TIME_TOOL_PATH)
             set(WRAPPER_COMMAND time)
         else()
-            message(STATUS "WARNING: Disabling time wrapper for ${AddTest_NAME} as time exe was not found!")
+            set(DISABLED_TESTS_LOG "${DISABLED_TESTS_LOG}\nDisabling time wrapper for ${AddTest_NAME} as time exe was not found!" CACHE INTERNAL "")
             set(AddTest_WRAPPER_ARGS "")
         endif()
     elseif(AddTest_WRAPPER STREQUAL "memcheck")
         if(VALGRIND_TOOL_PATH)
             set(WRAPPER_COMMAND "${VALGRIND_TOOL_PATH} --tool=memcheck --log-file=${AddTest_SOURCE_PATH}/${AddTest_NAME}_memcheck.log -v --leak-check=full --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xff")
             set(tester memcheck)
         else()
-            message(STATUS "WARNING: Disabling memcheck wrapper for ${AddTest_NAME} as memcheck exe was not found!")
+            set(DISABLED_TESTS_LOG "${DISABLED_TESTS_LOG}\nDisabling memcheck wrapper for ${AddTest_NAME} as memcheck exe was not found!" CACHE INTERNAL "")
             set(AddTest_WRAPPER_ARGS "")
         endif()
     elseif(AddTest_WRAPPER STREQUAL "callgrind")
         if(VALGRIND_TOOL_PATH)
             set(WRAPPER_COMMAND "${VALGRIND_TOOL_PATH} --tool=callgrind --branch-sim=yes --cache-sim=yes --dump-instr=yes --collect-jumps=yes")
             unset(tester)
         else()
-            message(STATUS "WARNING: Disabling callgrind wrapper for ${AddTest_NAME} as callgrind exe was not found!")
+            set(DISABLED_TESTS_LOG "${DISABLED_TESTS_LOG}\nDisabling callgrind wrapper for ${AddTest_NAME} as callgrind exe was not found!" CACHE INTERNAL "")
             set(AddTest_WRAPPER_ARGS "")
         endif()
     elseif(AddTest_WRAPPER STREQUAL "mpirun")