From 0c7ffe74ee9515e7ce4a1c867a260d254786cc3f Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Wed, 15 Jan 2014 15:42:18 -0600 Subject: [PATCH] Don't use LOG_* options to ExternalProject_Add if not supported. They're in CMake 2.8.3 and greater, but not strictly necessary for the build to work -- they just make build output a bit nicer. --- CMakeLists.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7feaa4d1aa..28027d63d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,15 @@ set(VERSION_MAJ_MIN "${VERSION_MAJOR}.${VERSION_MINOR}") include(ExternalProject) +# LOG_* options to ExternalProject_Add appear in CMake 2.8.3. If +# available, using them hides external project configure/build output. +if("${CMAKE_VERSION}" VERSION_GREATER 2.8.2) + set(EXTERNAL_PROJECT_LOG_OPTIONS + LOG_DOWNLOAD 1 LOG_UPDATE 1 LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1) +else() + set(EXTERNAL_PROJECT_LOG_OPTIONS) +endif() + set(LIBMAGIC_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libmagic-prefix) set(LIBMAGIC_INCLUDE_DIR ${LIBMAGIC_PREFIX}/include) set(LIBMAGIC_LIB_DIR ${LIBMAGIC_PREFIX}/lib) @@ -53,10 +62,7 @@ ExternalProject_Add(libmagic --includedir=${LIBMAGIC_INCLUDE_DIR} --libdir=${LIBMAGIC_LIB_DIR} BUILD_IN_SOURCE 1 - LOG_DOWNLOAD 1 - LOG_CONFIGURE 1 - LOG_BUILD 1 - LOG_INSTALL 1 + ${EXTERNAL_PROJECT_LOG_OPTIONS} ) include(FindRequiredPackage)