Merge pull request #950 from bilke/local-boost-deps

Local boost dependencies

FileIO/CMakeLists.txt

@@ -64,10 +64,15 @@ if(QT4_FOUND)
 endif()
 
 ADD_VTK_DEPENDENCY(FileIO)
+
 if(TARGET Eigen)
 	add_dependencies(FileIO Eigen)
 endif()
 
+if(TARGET Boost)
+    add_dependencies(FileIO Boost)
+endif()
+
 file(GLOB XSD_FILES . *.xsd)
 if(APPLE AND OGS_BUILD_GUI)
 	install(FILES ${XSD_FILES} DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Darwin/DragNDrop/${CPACK_PACKAGE_FILE_NAME}/ALL_IN_ONE/DataExplorer.app/Contents/MacOS COMPONENT ogs_gui)

InSituLib/CMakeLists.txt

@@ -12,3 +12,7 @@ add_library(InSituLib
 target_link_libraries(InSituLib INTERFACE MeshLib ${VTK_LIBRARIES})
 
 ADD_VTK_DEPENDENCY(InSituLib)
+
+if(TARGET Boost)
+    add_dependencies(InSituLib Boost)
+endif()

MeshLib/CMakeLists.txt

@@ -31,3 +31,6 @@ if(TARGET Eigen)
     add_dependencies(MeshLib Eigen)
 endif()
 
+if(TARGET Boost)
+    add_dependencies(MeshLib Boost)
+endif()

scripts/cmake/ExternalProjectBoost.cmake

@@ -19,6 +19,9 @@ if(NOT Boost_INCLUDE_DIRS)
 	endif()
 	if(OGS_LIB_BOOST STREQUAL "System")
 		find_package(Boost ${OGS_BOOST_VERSION} REQUIRED)
+		if(NOT Boost_FOUND)
+			message(FATAL_ERROR "Aborting CMake because system Boost was not found!")
+		endif()
 	elseif(OGS_LIB_BOOST STREQUAL "Default")
 		find_package(Boost ${OGS_BOOST_VERSION})
 	endif()

scripts/cmake/ExternalProjectEigen.cmake

 if(OGS_LIB_EIGEN STREQUAL "System")
 	find_package(Eigen3 3.2.5 REQUIRED)
+	if(NOT EIGEN3_FOUND)
+		message(FATAL_ERROR "Aborting CMake because system Eigen was not found!")
+	endif()
 elseif(OGS_LIB_EIGEN STREQUAL "Default")
 	find_package(Eigen3 3.2.5)
 endif()

scripts/cmake/ExternalProjectVtk.cmake

@@ -14,6 +14,9 @@ endif()
 
 if(OGS_LIB_VTK STREQUAL "System")
 	find_package(VTK 6.1 COMPONENTS ${VTK_MODULES} NO_MODULE REQUIRED)
+	if(NOT VTK_FOUND)
+		message(FATAL_ERROR "Aborting CMake because system VTK was not found!")
+	endif()
 elseif(OGS_LIB_VTK STREQUAL "Default" OR DEFINED VTK_DIR)
 	find_package(VTK 6.1 COMPONENTS ${VTK_MODULES} NO_MODULE QUIET)
 endif()