Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-12 11:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Don't use LOG_* options to ExternalProject_Add if not supported.

Browse source 
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.
This commit is contained in:
Jon Siwek 2014-01-15 15:42:18 -06:00
parent c48c531629
commit 0c7ffe74ee
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CMakeLists.txt
View file

@ -41,6 +41,15 @@ set(VERSION_MAJ_MIN "${VERSION_MAJOR}.${VERSION_MINOR}")
include(ExternalProject) 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_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libmagic-prefix)
set(LIBMAGIC_INCLUDE_DIR ${LIBMAGIC_PREFIX}/include) set(LIBMAGIC_INCLUDE_DIR ${LIBMAGIC_PREFIX}/include)
set(LIBMAGIC_LIB_DIR ${LIBMAGIC_PREFIX}/lib) set(LIBMAGIC_LIB_DIR ${LIBMAGIC_PREFIX}/lib)
@ -53,10 +62,7 @@ ExternalProject_Add(libmagic
--includedir=${LIBMAGIC_INCLUDE_DIR} --includedir=${LIBMAGIC_INCLUDE_DIR}
--libdir=${LIBMAGIC_LIB_DIR} --libdir=${LIBMAGIC_LIB_DIR}
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
LOG_DOWNLOAD 1 ${EXTERNAL_PROJECT_LOG_OPTIONS}
LOG_CONFIGURE 1
LOG_BUILD 1
LOG_INSTALL 1
) )
include(FindRequiredPackage) include(FindRequiredPackage)