Skip to content
Snippets Groups Projects
Commit f44af100 authored by Lars Bilke's avatar Lars Bilke
Browse files

[CMake] Switched to bincrafters modular boost conan packages.

parent b6dd6ed9
No related branches found
No related tags found
No related merge requests found
...@@ -31,7 +31,8 @@ endif() ...@@ -31,7 +31,8 @@ endif()
include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake) include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake)
set(CONAN_REQUIRES set(CONAN_REQUIRES
Boost/1.64.0@conan/stable boost_optional/1.66.0@bincrafters/stable
boost_property_tree/1.66.0@bincrafters/stable
Eigen3/3.2.9@bilke/stable Eigen3/3.2.9@bilke/stable
VTK/8.1.1@bilke/stable VTK/8.1.1@bilke/stable
CACHE INTERNAL "" CACHE INTERNAL ""
......
...@@ -60,8 +60,10 @@ find_program(MODULE_CMD modulecmd ...@@ -60,8 +60,10 @@ find_program(MODULE_CMD modulecmd
###################### ######################
### Find libraries ### ### Find libraries ###
###################### ######################
find_package(Boost REQUIRED) if(NOT OGS_USE_CONAN)
include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) find_package(Boost REQUIRED)
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
endif()
find_package(VTK 8.1.0 REQUIRED) find_package(VTK 8.1.0 REQUIRED)
include(${VTK_USE_FILE}) include(${VTK_USE_FILE})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment