Make conan usage optional.

CMakeLists.txt

@@ -25,18 +25,23 @@ set(CMAKE_LIBRARY_SEARCH_PATH "" CACHE PATH
 set(OGS_CPU_ARCHITECTURE "native" CACHE STRING "Processor architecture, defaults to native.")
 option(OGS_BUILD_TESTS "Should the test executables be built?" ON)
 
-### CMake includes ###
+### Conan package manager ###
+set(USE_CONAN false CACHE INTERNAL "")
 if(EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 	include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+	set(USE_CONAN true)
 elseif(EXISTS ${CMAKE_SOURCE_DIR}/conanbuildinfo.cmake)
 	include(${CMAKE_SOURCE_DIR}/conanbuildinfo.cmake)
-else()
-	message(FATAL_ERROR "External dependencies not setup. Run conan install!")
+	set(USE_CONAN true)
+endif()
+if(USE_CONAN)
+	set(CMAKE_MODULE_PATH ${CONAN_CMAKE_MODULE_PATH} ${CMAKE_MODULE_PATH})
+	message(STATUS "Using conan package manager")
+	set(OGS_LIB_VTK System CACHE INTERNAL "")
+	set(OGS_LIB_BOOST System CACHE INTERNAL "")
 endif()
-conan_basic_setup()
-include(${CONAN_VTK_ROOT}/lib/cmake/vtk-7.0/VTKConfig.cmake)
-include(${VTK_USE_FILE})
 
+### CMake includes ###
 include(scripts/cmake/CheckTypeSizes.cmake)
 include(scripts/cmake/Functions.cmake)
 include(scripts/cmake/CMakeSetup.cmake)

FileIO/CMakeLists.txt

@@ -15,8 +15,6 @@ set(SOURCES
 	readMeshFromFile.cpp
 	writeGeometryToFile.h
 	writeGeometryToFile.cpp
-	SHPInterface.h
-	SHPInterface.cpp
 	TetGenInterface.h
 	TetGenInterface.cpp
 	TINInterface.h
@@ -26,6 +24,9 @@ set(SOURCES
 	writeMeshToFile.h
 	writeMeshToFile.cpp
 )
+if(Shapelib_FOUND)
+	list(APPEND SOURCES SHPInterface.h SHPInterface.cpp)
+endif()
 
 GET_SOURCE_FILES(SOURCES_LEGACY Legacy)
 GET_SOURCE_FILES(SOURCES_GMSHIO GmshIO)
@@ -59,7 +60,6 @@ target_link_libraries(FileIO INTERFACE
 	InSituLib
 	MeshLib
 	logog
-	${CONAN_LIBS}
 )
 if(QT4_FOUND)
 	target_link_libraries(FileIO PUBLIC Qt4::QtXml Qt4::QtXmlPatterns)
@@ -71,6 +71,10 @@ if(QT4_FOUND)
 	endif()
 endif()
 
+if(Shapelib_FOUND)
+	target_link_libraries(FileIO INTERFACE ${Shapelib_LIBRARIES})
+endif()
+
 ADD_VTK_DEPENDENCY(FileIO)
 
 if(TARGET Eigen)

vtkdiff @ a20c1bef

-Subproject commit 0a0bd8362f861b6e141936b990133c6616522a82
+Subproject commit a20c1bef6e35a5b53c101103820beca854934f37

scripts/cmake/ExternalProjectBoost.cmake

-return()
+if(USE_CONAN)
+	SET(BOOST_HEADER_ONLY TRUE)
+	find_package(Boost REQUIRED)
+	include_directories(SYSTEM ${CONAN_INCLUDE_DIRS_BOOST})
+	link_directories(${Boost_LIBRARY_DIR})
+	return()
+endif()
 include(ThirdPartyLibVersions)
 include(ExternalProject)
 

scripts/cmake/ExternalProjectVtk.cmake

-return()
+if(USE_CONAN)
+	find_package(VTK REQUIRED)
+	include(${VTK_USE_FILE})
+	include_directories(SYSTEM ${CONAN_INCLUDE_DIRS_VTK})
+	return()
+endif()
 include(ThirdPartyLibVersions)
 include(ExternalProject)
 

scripts/cmake/Find.cmake

@@ -138,3 +138,8 @@ if(OGS_USE_MPI)
 	find_package(MPI REQUIRED)
 	include_directories(SYSTEM ${MPI_CXX_INCLUDE_PATH})
 endif()
+
+find_package(Shapelib)
+if(Shapelib_FOUND)
+	include_directories(${Shapelib_INCLUDE_DIRS})
+endif()