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

[Conan] Switch to lower-case shapelib and offical eigen package.

parent b87f1f90
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 1
− 1
View file @ a3dd4b96
...@@ -49,7 +49,7 @@ set(OGS_CONAN_BUILD "missing" CACHE STRING "Possible values: all, missing, \ ...@@ -49,7 +49,7 @@ set(OGS_CONAN_BUILD "missing" CACHE STRING "Possible values: all, missing, \
# Third-party libraries, names come from Conan package names # Third-party libraries, names come from Conan package names
set(OGS_LIBS set(OGS_LIBS
VTK Boost Eigen3 Qt Shapelib libgeotiff petsc lis cvode vtk boost eigen qt shapelib libgeotiff petsc lis cvode
CACHE INTERNAL "") CACHE INTERNAL "")
foreach(LIB ${OGS_LIBS}) foreach(LIB ${OGS_LIBS})
set(OGS_LIB_${LIB} "Default" CACHE STRING "Which ${LIB} library should be used?") set(OGS_LIB_${LIB} "Default" CACHE STRING "Which ${LIB} library should be used?")
......
scripts/cmake/ConanSetup.cmake
+ 1
− 1
View file @ a3dd4b96
...@@ -26,7 +26,7 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake) ...@@ -26,7 +26,7 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake)
set(CONAN_REQUIRES set(CONAN_REQUIRES
boost/1.66.0@conan/stable boost/1.66.0@conan/stable
Eigen3/3.3.4@bilke/stable eigen/3.3.4@conan/stable
vtk/8.2.0@bilke/stable vtk/8.2.0@bilke/stable
CACHE INTERNAL "" CACHE INTERNAL ""
) )
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment