aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2014-10-21 13:33:26 -0400
committerBen Boeckel <ben.boeckel@kitware.com>2014-10-23 16:42:34 -0400
commita87ce0946192ab6ea3668298565a24bf66724691 (patch)
tree2a1f2d95bb3c312ff7a7db81788f02cba6c11fd8
parentminiupnpc: clear out else/endfoo command arguments (diff)
downloadmonero-a87ce0946192ab6ea3668298565a24bf66724691.tar.xz
cmake: factor out error messages
Instead of using BoldRed and ColourReset everywhere, wrap it up in a function.
-rw-r--r--CMakeLists.txt21
-rwxr-xr-xexternal/CMakeLists.txt6
2 files changed, 17 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78e4b426f..f729c4217 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,11 +30,18 @@
cmake_minimum_required(VERSION 2.8.6)
-if(NOT WIN32)
- string(ASCII 27 Esc)
- set(ColourReset "${Esc}[m")
- set(BoldRed "${Esc}[1;31m")
-endif()
+function (die msg)
+ if (NOT WIN32)
+ string(ASCII 27 Esc)
+ set(ColourReset "${Esc}[m")
+ set(BoldRed "${Esc}[1;31m")
+ else ()
+ set(ColourReset "")
+ set(BoldRed "")
+ endif ()
+
+ message(FATAL_ERROR "${BoldRed}${msg}${ColourReset}")
+endfunction ()
set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
@@ -204,11 +211,11 @@ endif()
find_package(Boost 1.53 QUIET REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options)
if(NOT Boost_FOUND)
- MESSAGE(FATAL_ERROR "${BoldRed}Could not find Boost libraries, please make sure you have installed Boost or libboost-all-dev (1.53 or 1.55+) or the equivalent${ColourReset}")
+ die("Could not find Boost libraries, please make sure you have installed Boost or libboost-all-dev (1.53 or 1.55+) or the equivalent")
endif()
if((${Boost_MAJOR_VERSION} EQUAL 1) AND (${Boost_MINOR_VERSION} EQUAL 54))
- message(FATAL_ERROR "${BoldRed}Boost version 1.54 is unsupported due to a bug (see: http://goo.gl/RrCFmA), please install Boost 1.53 or 1.55 and above${ColourReset}")
+ die("Boost version 1.54 is unsupported due to a bug (see: http://goo.gl/RrCFmA), please install Boost 1.53 or 1.55 and above")
endif()
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 83e9e6dee..b1fa8b2ff 100755
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -89,14 +89,14 @@ IF(!UNBOUND_INCLUDE_DIR OR STATIC)
FIND_PACKAGE(OpenSSL QUIET)
IF(!OPENSSL_LIBRARIES)
- MESSAGE(FATAL_ERROR "${BoldRed}Could not find the openssl library. Please make sure you have installed openssl or libssl-dev or the equivalent${ColourReset}")
+ die("Could not find the openssl library. Please make sure you have installed openssl or libssl-dev or the equivalent")
ELSE()
MESSAGE(STATUS "Found openssl libraries")
ENDIF()
FIND_PACKAGE(Expat QUIET)
IF(!EXPAT_LIBRARIES)
- MESSAGE(FATAL_ERROR "${BoldRed}Could not find the expat library. Please make sure you have installed libexpat or libexpat-dev or the equivalent${ColourReset}")
+ die("Could not find the expat library. Please make sure you have installed libexpat or libexpat-dev or the equivalent")
ELSE()
MESSAGE(STATUS "Found expat libraries")
ENDIF()
@@ -170,6 +170,6 @@ ELSE()
set(UNBOUND_INCLUDE ${UNBOUND_INCLUDE_DIR} PARENT_SCOPE)
set(UNBOUND_LIBRARY ${UNBOUND_LIBRARIES} PARENT_SCOPE)
ELSE()
- MESSAGE(FATAL_ERROR "${BoldRed}Found libunbound includes, but could not find libunbound library. Please make sure you have installed libunbound or libunbound-dev or the equivalent${ColourReset}")
+ die("Found libunbound includes, but could not find libunbound library. Please make sure you have installed libunbound or libunbound-dev or the equivalent")
ENDIF()
ENDIF()