From 6592515313fcb27575aa14805106dcabb87a606c Mon Sep 17 00:00:00 2001 From: Mark Abraham Date: Thu, 3 Jul 2014 16:30:04 +0200 Subject: [PATCH] Quieten repeated cmake runs We should not hassle the user about optional libraries that were not found the first time. If the user wants to detect ones found in a different place, then they can unset the relevant cache variables to re-trigger detection and/or related output. Change-Id: I266268dccc46da5b098d3d5640798cbee7ee6fd0 --- CMakeLists.txt | 3 +++ cmake/FindPandoc.cmake | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7b8f27856..85bf5ffd65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -448,6 +448,9 @@ include(gmxManageSharedLibraries) # tests. This exports LIBXML2_FOUND, which we should not use because # it does not tell us that linking will succeed. Instead, we test that # next. +if(DEFINED LIBXML2_LIBRARIES) + set(LibXml2_FIND_QUIETLY TRUE) +endif() find_package(LibXml2) include(gmxTestLibXml2) gmx_test_libxml2(HAVE_LIBXML2) diff --git a/cmake/FindPandoc.cmake b/cmake/FindPandoc.cmake index 3c8499136c..3981d59406 100644 --- a/cmake/FindPandoc.cmake +++ b/cmake/FindPandoc.cmake @@ -39,8 +39,8 @@ include(FindPackageHandleStandardArgs) -if(Pandoc_FIND_QUIETLY OR DEFINED PANDOC_EXECUTABLE) - set(PANDOC_FIND_QUIETLY TRUE) +if(DEFINED PANDOC_EXECUTABLE) + set(Pandoc_FIND_QUIETLY TRUE) endif() find_program(PANDOC_EXECUTABLE -- 2.22.0