diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 17d68a0bc44124143b155f12b74b4d3bf6873474..dce4e2cf9c931927436f112364d2f308d60589b4 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -25,9 +25,9 @@ endif() include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake) set(CONAN_REQUIRES - boost/1.66.0@conan/stable - eigen/3.3.4@conan/stable - vtk/8.2.0@bilke/stable + boost/${ogs.minimum_version.boost}@conan/stable + eigen/${ogs.minimum_version.eigen}@conan/stable + vtk/${ogs.tested_version.vtk}@bilke/stable CACHE INTERNAL "" ) @@ -74,9 +74,9 @@ if(OGS_BUILD_GUI) zlib/1.2.11 ) if(UNIX) - set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/5.14.1@bincrafters/stable) + set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/${ogs.tested_version.qt.linux}@bincrafters/stable) else() - set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/5.13.2@bincrafters/stable) + set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/${ogs.tested_version.qt.win}@bincrafters/stable) endif() set(CONAN_OPTIONS ${CONAN_OPTIONS} vtk:minimal=False diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index 91861612998b8914ea440469df762773c168d851..f27da8092807262a8a2993a10de0f79eb7430a8c 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -59,7 +59,7 @@ find_program(MODULE_CMD modulecmd ###################### ### Find libraries ### ###################### -find_package(Boost 1.62.0 REQUIRED) +find_package(Boost ${ogs.minimum_version.boost} REQUIRED) set(VTK_COMPONENTS vtkIOXML) if(OGS_BUILD_GUI) @@ -73,10 +73,10 @@ endif() if(OGS_USE_MPI) set(VTK_COMPONENTS ${VTK_COMPONENTS} vtkIOParallelXML vtkParallelMPI) endif() -find_package(VTK 8.1.2 REQUIRED COMPONENTS ${VTK_COMPONENTS}) +find_package(VTK ${ogs.minimum_version.vtk} REQUIRED COMPONENTS ${VTK_COMPONENTS}) include(${VTK_USE_FILE}) -find_package(Eigen3 3.3.4 REQUIRED) +find_package(Eigen3 ${ogs.minimum_version.eigen} REQUIRED) include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR}) ## pthread, is a requirement of logog ## @@ -108,7 +108,7 @@ if(OGS_BUILD_GUI) if(OGS_USE_CONAN AND UNIX AND NOT APPLE) set(QT_MODULES ${QT_MODULES} X11Extras) endif() - find_package(Qt5 5.2 REQUIRED ${QT_MODULES}) + find_package(Qt5 ${ogs.minimum_version.qt} REQUIRED ${QT_MODULES}) cmake_policy(SET CMP0020 NEW) endif() @@ -155,7 +155,7 @@ if(OGS_USE_PETSC) set(PETSC_EXECUTABLE_RUNS YES) endif() - find_package(PETSc REQUIRED) + find_package(PETSc ${ogs.minimum_version.petsc} REQUIRED) include_directories(SYSTEM ${PETSC_INCLUDES}) diff --git a/web/content/docs/devguide/advanced/third-party-libraries.pandoc b/web/content/docs/devguide/advanced/third-party-libraries.pandoc index 74045f5210cfe0586eb053a9e2c7b45f7a2ca2b2..74baa7670b46e51b6855ba364a0ce5855b601109 100644 --- a/web/content/docs/devguide/advanced/third-party-libraries.pandoc +++ b/web/content/docs/devguide/advanced/third-party-libraries.pandoc @@ -19,13 +19,13 @@ We strongly recommend to simply use [Conan]({{< ref "conan.pandoc" >}}) for hand The following libraries are required: -- [Boost](http://www.boost.org/) >= 1.56.0 -- [Eigen](http://eigen.tuxfamily.org/) >= 3.2.9 -- [VTK](https://www.vtk.org/) >= 7.1.0 +- [Boost](http://www.boost.org/) >= {{< dataFile "versions.minimum_version.boost" >}} +- [Eigen](http://eigen.tuxfamily.org/) >= {{< dataFile "versions.minimum_version.eigen" >}} +- [VTK](https://www.vtk.org/) >= {{< dataFile "versions.minimum_version.vtk" >}} If you want to build the Data Explorer you need these too: -- [Qt](https://www.qt.io/) >= 5.9.2 +- [Qt](https://www.qt.io/) >= {{< dataFile "versions.minimum_version.qt" >}} - [Shapelib](http://shapelib.maptools.org) >= 1.3.0 - [libgeotiff](https://trac.osgeo.org/geotiff/) >= 1.4.2 diff --git a/web/content/docs/devguide/getting-started/prerequisites.pandoc b/web/content/docs/devguide/getting-started/prerequisites.pandoc index 50babcb9b3edf20533d59a2f57f1e51b05720134..c7babee22ebdac4422a7a60c545378b23f7f3e6e 100644 --- a/web/content/docs/devguide/getting-started/prerequisites.pandoc +++ b/web/content/docs/devguide/getting-started/prerequisites.pandoc @@ -15,7 +15,7 @@ The minimum prerequisites to build OGS are: - An 64-bit operating system (Linux, Windows 7 and up, macOS) - Git (version control tool, at least version {{< dataFile "versions.minimum_version.git" >}}) -- CMake (build configuration tool, at least version 3.12) +- CMake (build configuration tool, at least version {{< dataFile "versions.minimum_version.cmake" >}}) - A compiler with [C++17](http://en.wikipedia.org/wiki/C%2B%2B17)-support - [Conan package manager](https://www.conan.io/) (at least version {{< dataFile "versions.minimum_version.conan" >}}) **OR** install [required libraries]({{< ref "third-party-libraries.pandoc" >}}) manually (for advanced users only!) @@ -88,7 +88,7 @@ Please check if Git is already installed: ```bash $ git --version -git version 1.7.4.1 +git version {{< dataFile "versions.minimum_version.git" >}} ``` Otherwise please install Git with your favorite package manager: diff --git a/web/data/versions.json b/web/data/versions.json index 65efe875754357495d05384efba12578ba5258f6..242469daa897c83ef0800dbdb05e76da0aaa509d 100644 --- a/web/data/versions.json +++ b/web/data/versions.json @@ -8,6 +8,19 @@ "toolset": "141" }, "conan": "1.21.0", - "git": "2.14" + "git": "2.14", + "cmake": "3.12", + "boost": "1.66.0", + "eigen": "3.3.4", + "vtk": "8.1.2", + "petsc": "3.8.3", + "qt": "5.12.4" + }, + "tested_version": { + "vtk": "8.2.0", + "qt": { + "linux": "5.14.1", + "win": "5.13.2" + } } }