Merge pull request #646 from bilke/cmake-library-fixes

Handle OGS_NO_BOOST_DOWNLOAD properly

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)

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)