From 659c96eb1bb8c6cc4a4eab6de0b2ee3f82bd50af Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Thu, 2 Feb 2017 18:48:15 +0100 Subject: [PATCH] Optionally locate boost via environment variable BOOST_ROOT This was already the case for our autotools based build and simplifies the build setup for our Windows build system. --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b77bfd289..85d930b3ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,7 +131,6 @@ IF (WIN32) SET(CMAKE_FRAMEWORK_PATH "${CMAKE_FRAMEWORK_PATH_TMP}") SET(PKG_CONFIG_EXECUTABLE ${CMAKE_PREFIX_PATH}/gnome/bin/pkg-config.exe) SET(SWIG_EXECUTABLE ${CMAKE_PREFIX_PATH}/swig/swig.exe) - SET(BOOST_ROOT ${CMAKE_PREFIX_PATH}/boost) SET(REGEX_INCLUDE_PATH ${CMAKE_PREFIX_PATH}/regex/include) SET(REGEX_LDFLAGS "-L${CMAKE_PREFIX_PATH}/regex/lib -lregex") SET(LIBXSLT_INCLUDE_DIR ${CMAKE_PREFIX_PATH}/libxslt/include) @@ -420,6 +419,9 @@ ENDIF() SET (Boost_USE_MULTITHREADED ON) SET (Boost_FIND_QUIETLY ON) +IF (NOT DEFINED ${BOOST_ROOT}) + SET(BOOST_ROOT $ENV{BOOST_ROOT}) +ENDIF() FIND_PACKAGE (Boost 1.54.0 REQUIRED COMPONENTS date_time regex) IF (Boost_FOUND)