Skip to content
Snippets Groups Projects
Unverified Commit 83920a33 authored by Lars Bilke's avatar Lars Bilke Committed by GitHub
Browse files

Merge pull request #2417 from endJunction/FixConanVsSysteLibrarySelection

Fix conan (Default) vs System library selection
parents d7a6c80c 7ee46e63
No related branches found
No related tags found
No related merge requests found
......@@ -46,6 +46,16 @@ endif()
option(OGS_USE_CONAN "Should Conan package manager be used?" ON)
set(OGS_CONAN_BUILD "missing" CACHE STRING "Possible values: all, missing, \
never or list of libs to build" )
# Third-party libraries, names come from Conan package names
set(OGS_LIBS
VTK Boost Eigen3 Qt Shapelib libgeotiff petsc lis cvode
CACHE INTERNAL "")
foreach(LIB ${OGS_LIBS})
set(OGS_LIB_${LIB} "Default" CACHE STRING "Which ${LIB} library should be used?")
set_property(CACHE OGS_LIB_${LIB} PROPERTY STRINGS "Default" "System")
endforeach(LIB)
if(OGS_USE_PETSC)
set(OGS_USE_MPI ON CACHE BOOL "Use MPI" FORCE)
endif()
......@@ -214,13 +224,6 @@ option(OGS_COVERAGE "Enables code coverage measurements with gcov/lcov." OFF)
option(OGS_SYNC_SUBMODULES "Sync git submodules on CMake run. Overwrites custom URLs!" ON)
# Third-party libraries, names come from Conan package names
set(OGS_LIBS VTK Boost Eigen3 Qt Shapelib libgeotiff CACHE INTERNAL "")
foreach(LIB ${OGS_LIBS})
set(OGS_LIB_${LIB} "Default" CACHE STRING "Which ${LIB} library should be used?")
set_property(CACHE OGS_LIB_${LIB} PROPERTY STRINGS "Default" "System")
endforeach(LIB)
# Options controlling which FEM elements will be compiled
set(OGS_MAX_ELEMENT_DIM 3 CACHE STRING "Maximum dimension of FEM elements to be built.")
set(OGS_MAX_ELEMENT_ORDER 2 CACHE STRING "Maximum order of FEM elements to be built.")
......
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