From: Peter Kümmel <syntheticpp@gmx.net>
Date: Mon, 17 Aug 2009 18:17:12 +0000 (+0000)
Subject: cmake: error when external boost is required but not found
X-Git-Tag: 2.0.0~5682
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0d256167a76f998ebac415bd860443d66b2df9d8;p=lyx.git

cmake: error when external boost is required but not found

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31096 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index c6b995170f..dd335badbf 100644
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -396,18 +396,19 @@ add_definitions(-DHAVE_ICONV=1)
 include_directories(
   ${CMAKE_BINARY_DIR}
   ${TOP_SRC_DIR}/src)
+  
+option(UseExternalBoost "Use external boost" OFF)
 if(UseExternalBoost)
   message(STATUS "Searching for boost")
   find_package(Boost COMPONENTS signals regex)
+  if(Boost_FOUND)
+    message(STATUS "Boost found")
+    message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
+  else()
+    message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
+  endif()
 else()
   message(STATUS "----- Using internal boost. To build with installed version use -DUseExternalBoost:BOOL=ON")
-endif()
-
-if(Boost_FOUND)
-  message(STATUS "Boost found")
-  message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
-else()
-  message(STATUS "Boost not found" ${Boost_ERROR_REASON})
   add_definitions(-DBOOST_USER_CONFIG="<config.h>")
   include_directories(${TOP_SRC_DIR}/boost)
   add_subdirectory(boost)