Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Customizable error messages for missing prereqs.

Browse source 
Adds the FindRequiredPackage() macro that wraps the functionality
of the standard find_package() macro.
This commit is contained in:
Jon Siwek 2010-11-17 19:48:34 -06:00
parent ffdf9e7474
commit efce9dbfe2
4 changed files with 63 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
CMakeLists.txt
View file

@ -1,6 +1,4 @@
######################################################################## ######################################################################## ## CMake Configuration
## CMake Configuration
cmake_minimum_required(VERSION 2.8 FATAL_ERROR) cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
# Prohibit in-source builds. # Prohibit in-source builds.
@ -46,6 +44,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_COMPILE_FLAGS}")
######################################################################## ########################################################################
## Dependency Configuration ## Dependency Configuration
include(FindRequiredPackage)
# Check cache value first to avoid displaying "Found sed" messages everytime # Check cache value first to avoid displaying "Found sed" messages everytime
if (NOT SED_EXE) if (NOT SED_EXE)
find_program(SED_EXE sed) find_program(SED_EXE sed)
@ -56,17 +56,24 @@ if (NOT SED_EXE)
endif () endif ()
endif () endif ()
find_package(Perl REQUIRED) FindRequiredPackage(Perl)
find_package(FLEX REQUIRED) FindRequiredPackage(FLEX)
find_package(BISON REQUIRED) FindRequiredPackage(BISON)
find_package(PCAP REQUIRED) FindRequiredPackage(PCAP)
find_package(OpenSSL REQUIRED) FindRequiredPackage(OpenSSL)
find_package(BIND REQUIRED) FindRequiredPackage(BIND)
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/binpac/CMakeLists.txt) if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/binpac/CMakeLists.txt)
add_subdirectory(aux/binpac) add_subdirectory(aux/binpac)
endif () endif ()
find_package(BinPAC REQUIRED) FindRequiredPackage(BinPAC)
if (MISSING_PREREQS)
foreach (prereq ${MISSING_PREREQ_DESCS})
message(SEND_ERROR ${prereq})
endforeach ()
message(FATAL_ERROR "Configuration aborted due to missing prerequisites")
endif ()
include_directories(BEFORE include_directories(BEFORE
${PCAP_INCLUDE_DIR} ${PCAP_INCLUDE_DIR}

2
cmake/FindLibGeoIP.cmake
View file

@ -13,7 +13,7 @@
# #
# Variables defined by this module: # Variables defined by this module:
# #
# LIBGeoIP_FOUND System has GeoIP libraries and headers # LIBGEOIP_FOUND System has GeoIP libraries and headers
# LibGeoIP_LIBRARY The GeoIP library # LibGeoIP_LIBRARY The GeoIP library
# LibGeoIP_INCLUDE_DIR The location of GeoIP headers # LibGeoIP_INCLUDE_DIR The location of GeoIP headers

2
cmake/FindOpenSSL.cmake
View file

@ -13,7 +13,7 @@
# #
# Variables defined by this module: # Variables defined by this module:
# #
# OpenSSL_FOUND System has openssl, include and library dirs found # OPENSSL_FOUND System has openssl, include and library dirs found
# OpenSSL_INCLUDE_DIR The openssl include directories. # OpenSSL_INCLUDE_DIR The openssl include directories.
# OpenSSL_LIBRARIES The openssl libraries. # OpenSSL_LIBRARIES The openssl libraries.
# OpenSSL_CYRPTO_LIBRARY The openssl crypto library. # OpenSSL_CYRPTO_LIBRARY The openssl crypto library.

44
cmake/FindRequiredPackage.cmake Normal file
View file

@ -0,0 +1,44 @@
# A wrapper macro around the standard CMake find_package macro that
# facilitates displaying better error messages by default, or even
# accepting custom error messages on a per package basis.
#
# If a package is not found, then the MISSING_PREREQS variable gets
# set to true and either a default or custom error message appended
# to MISSING_PREREQ_DESCS.
#
# The caller can use these variables to display a list of any missing
# packages and abort the build/configuration if there were any.
#
# Use as follows:
#
# include(FindRequiredPackage)
# FindRequiredPackage(Perl)
# FindRequiredPackage(FLEX "You need to install flex (Fast Lexical Analyzer)")
#
# if (MISSING_PREREQS)
# foreach (prereq ${MISSING_PREREQ_DESCS})
# message(SEND_ERROR ${prereq})
# endforeach ()
# message(FATAL_ERROR "Configuration aborted due to missing prerequisites")
# endif ()
macro(FindRequiredPackage packageName)
find_package(${packageName})
string(TOUPPER ${packageName} canonPackageName)
if (NOT ${canonPackageName}_FOUND)
set(MISSING_PREREQS true)
set(customDesc)
foreach (descArg ${ARGN})
set(customDesc "${customDesc} ${descArg}")
endforeach ()
if (customDesc)
# append the custom error message that was provided as an argument
list(APPEND MISSING_PREREQ_DESCS ${customDesc})
else ()
list(APPEND MISSING_PREREQ_DESCS
" Could not find prerequisite package '${packageName}'")
endif ()
endif ()
endmacro(FindRequiredPackage)