From d1327b447b386fa77294eabea909d6beae8c8875 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 16 Apr 2015 11:51:40 +0200
Subject: [PATCH] Handle OGS_NO_BOOST_DOWNLOAD correctly.
Removed ning ef(Boost_FOUND) statement.
---
.../Utils/FileConverter/CMakeLists.txt | 24 +++++++++----------
scripts/cmake/ExternalProjectBoost.cmake | 9 ++++++-
2 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/Applications/Utils/FileConverter/CMakeLists.txt b/Applications/Utils/FileConverter/CMakeLists.txt
index 578fb17ea1b..cceae22bc39 100644
--- a/Applications/Utils/FileConverter/CMakeLists.txt
+++ b/Applications/Utils/FileConverter/CMakeLists.txt
@@ -53,19 +53,17 @@ if (QT4_FOUND)
ADD_CATALYST_DEPENDENCY(FEFLOW2OGS)
endif () # QT4_FOUND
-if (Boost_FOUND)
- add_executable(generateMatPropsFromMatID generateMatPropsFromMatID.cpp )
- target_link_libraries(generateMatPropsFromMatID
- FileIO
- MeshLib
- logog
- InSituLib
- ${CATALYST_LIBRARIES}
- )
- ADD_CATALYST_DEPENDENCY(generateMatPropsFromMatID)
- set_target_properties(generateMatPropsFromMatID
- PROPERTIES FOLDER Utilities)
-endif () # Boost_FOUND
+add_executable(generateMatPropsFromMatID generateMatPropsFromMatID.cpp )
+target_link_libraries(generateMatPropsFromMatID
+ FileIO
+ MeshLib
+ logog
+ InSituLib
+ ${CATALYST_LIBRARIES}
+)
+ADD_CATALYST_DEPENDENCY(generateMatPropsFromMatID)
+set_target_properties(generateMatPropsFromMatID
+ PROPERTIES FOLDER Utilities)
add_executable(GMSH2OGS GMSH2OGS.cpp)
set_target_properties(GMSH2OGS PROPERTIES FOLDER Utilities)
diff --git a/scripts/cmake/ExternalProjectBoost.cmake b/scripts/cmake/ExternalProjectBoost.cmake
index 12ff4a0f69d..fbb0959e4a4 100644
--- a/scripts/cmake/ExternalProjectBoost.cmake
+++ b/scripts/cmake/ExternalProjectBoost.cmake
@@ -62,7 +62,14 @@ if(NOT Boost_INCLUDE_DIRS)
if(WIN32 AND COMPILER_IS_GCC)
set(BOOST_INCLUDEDIR "$ENV{CMAKE_LIBRARY_SEARCH_PATH}/include/boost*")
endif()
- find_package(Boost 1.46.0 COMPONENTS ${BOOST_LIBS_TO_BUILD})
+ if(OGS_NO_BOOST_DOWNLOAD)
+ find_package(Boost 1.46.0 COMPONENTS ${BOOST_LIBS_TO_BUILD} REQUIRED)
+ if(NOT Boost_FOUND)
+ message(FATAL_ERROR "Aborting CMake because Boost was not found!.")
+ endif()
+ else()
+ find_package(Boost 1.46.0 COMPONENTS ${BOOST_LIBS_TO_BUILD})
+ endif()
if(Boost_FOUND)
set(Boost_FOUND TRUE CACHE BOOL "Was Boost found?" FORCE)
set(Boost_INCLUDE_DIRS "${Boost_INCLUDE_DIRS}" CACHE STRING "Boost include dirs" FORCE)
--
GitLab