From 8c8a4580455b7e3706ce411276b5bc832b09351a Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 13 Sep 2018 16:53:22 +0200
Subject: [PATCH] [web] Adapted docs for new Conan behavior.
---
.../devguide/advanced/conan-package-manager.pandoc | 4 ++--
.../getting-started/build-configuration.pandoc | 12 +-----------
.../docs/devguide/troubleshooting/conan.pandoc | 2 +-
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/web/content/docs/devguide/advanced/conan-package-manager.pandoc b/web/content/docs/devguide/advanced/conan-package-manager.pandoc
index 9080b43a08f..ac0ef1f0402 100644
--- a/web/content/docs/devguide/advanced/conan-package-manager.pandoc
+++ b/web/content/docs/devguide/advanced/conan-package-manager.pandoc
@@ -15,11 +15,11 @@ weight = 1032
As of OpenGeoSys 6.1.0 Conan version 1.0.0 is required! Please update Conan by running `pip install --upgrade conan` or by downloading the Windows installer.
:::
-The [Conan package manager](https://www.conan.io) helps to install all required libraries in a convenient way on every platform. See [Setup pre-requisites](../../getting-started/prerequisites) for installation instructions. Set the CMake option `OGS_USE_CONAN=ON` to enable Conan.
+The [Conan package manager](https://www.conan.io) helps to install all required libraries in a convenient way on every platform. See [Setup pre-requisites](../../getting-started/prerequisites) for installation instructions. If the Conan executable is found Conan is used for third-party library handling. Set the CMake option `OGS_USE_CONAN=OFF` to disable Conan.
## Advanced usage
-Per default when Conan is enabled (`OGS_USE_CONAN=ON`) it will try to fetch prebuilt binaries from the [OGS Conan repository](https://ogs.jfrog.io/ogs/conan/) at https://ogs.jfrog.io/ogs/api/conan/conan. With the CMake option `OGS_CONAN_BUILD` you define what gets build locally. This option can be set to:
+Per default when Conan is enabled it will try to fetch prebuilt binaries from the [OGS Conan repository](https://ogs.jfrog.io/ogs/conan/) at https://ogs.jfrog.io/ogs/api/conan/conan. With the CMake option `OGS_CONAN_BUILD` you define what gets build locally. This option can be set to:
- `missing` - Default, only builds packages which are not available as a prebuilt binary for the current configuration
- `all` - Builds all packages locally
diff --git a/web/content/docs/devguide/getting-started/build-configuration.pandoc b/web/content/docs/devguide/getting-started/build-configuration.pandoc
index 646a5c57671..1cc2ea0887e 100644
--- a/web/content/docs/devguide/getting-started/build-configuration.pandoc
+++ b/web/content/docs/devguide/getting-started/build-configuration.pandoc
@@ -23,13 +23,11 @@ So just go ahead and create a build-directory along your source code directory.
## Install required libraries with Conan
-It is preferred to use Conan package manager to install required third-party libraries. To use Conan add the CMake option `OGS_USE_CONAN=ON` to the CMake run (see below). This will run Conan automatically downloading either prebuilt binaries of required libraries or building them locally if a binary for your setup (operating system, compiler, ..) is not available. [Check this]({{< ref "conan-package-manager.pandoc" >}}) for advanced Conan usage.
+It is preferred to use Conan package manager to install required third-party libraries. If [Conan is installed]({{< ref "prerequisites" >}}#step-install-conan-package-manager) it will automatically download either prebuilt binaries of required libraries or build them locally if a binary for your setup (operating system, compiler, ..) is not available. [Check this]({{< ref "conan-package-manager.pandoc" >}}) for advanced Conan usage.
*Note:* Instead of using Conan you can optionally [install the required libraries manually]({{< ref "third-party-libraries.pandoc" >}}).
::: {.win}
-Add `-DOGS_USE_CONAN=ON` to the CMake-run (see below).
-
::: {.note}
### <i class="fas fa-exclamation-triangle"></i> Multi-configuration with Conan and Visual Studio
@@ -50,14 +48,6 @@ Please also note that in Visual Studio you have to choose the correct configurat
:::
:::
-::: {.linux}
-Add `-DOGS_USE_CONAN=ON` to the CMake-run (see below).
-:::
-
-::: {.mac}
-Add `-DOGS_USE_CONAN=ON` to the CMake-run (see below).
-:::
-
## Configure with CMake
diff --git a/web/content/docs/devguide/troubleshooting/conan.pandoc b/web/content/docs/devguide/troubleshooting/conan.pandoc
index a4e9533826a..848d914378f 100644
--- a/web/content/docs/devguide/troubleshooting/conan.pandoc
+++ b/web/content/docs/devguide/troubleshooting/conan.pandoc
@@ -14,7 +14,7 @@ weight = 1042
When CMake is run Conan will download library packages. You can see under `Requirements` in the CMake output from where the packages will be downloaded. Most packages will come `from ogs`:
```bash
-$ cmake ../ogs -DOGS_USE_CONAN=ON
+$ cmake ../ogs
...
-- Conan executing: conan install . -g cmake -s build_type=Release -s os=Macos -s compiler=apple-clang -s compiler.version=9.0 -s compiler.libcxx=libc++ --build=missing --update
PROJECT: Installing /Users/bilke/code/ogs6/build-n/conanfile.txt
--
GitLab