Skip to content

Commit

Permalink
[Conan] Switch to Boost 1.64.0 with fewer dependencies.
Browse files Browse the repository at this point in the history
My Boost fix was integrated in 1.64.0 only.

Added Conan remote conan-community where the package is hosted.
  • Loading branch information
bilke committed Sep 8, 2017
1 parent cec7094 commit 13a5c09
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion scripts/cmake/ConanSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ endif()
include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake)

set(CONAN_REQUIRES
Boost/[>=1.56.0]@lasote/stable
Boost/1.64.0@conan/stable
Eigen3/3.2.9@bilke/stable
VTK/[>=7.1]@bilke/stable
CACHE INTERNAL ""
Expand Down Expand Up @@ -52,6 +52,14 @@ else()
execute_process(COMMAND ${CONAN_CMD} remote add -i 0 ogs https://ogs.jfrog.io/ogs/api/conan/conan)
endif()

# Add conan-community remote
if("${CONAN_REMOTES}" MATCHES "conan-community: https://api.bintray.com/conan/conan-community/conan")
execute_process(COMMAND ${CONAN_CMD} remote update -i 2 conan-community https://api.bintray.com/conan/conan-community/conan)
else()
message(STATUS "Conan adding community remote repositoy (https://api.bintray.com/conan/conan-community/conan)")
execute_process(COMMAND ${CONAN_CMD} remote add -i 2 conan-community https://api.bintray.com/conan/conan-community/conan)
endif()

# Remove libraries from Conan which are set to "System"
message(STATUS "Third-party libraries:")
foreach(LIB ${OGS_LIBS})
Expand Down

0 comments on commit 13a5c09

Please sign in to comment.