From 3077cadcef6eec59a836cc52c9304986d0cd75eb Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 30 Sep 2020 13:44:07 +0200
Subject: [PATCH] [CMake] Automatically install Conan when OGS_USE_CONAN=auto.
Is installed into the build dir's virtualenv (.venv/bin)
---
scripts/cmake/ConanSetup.cmake | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index 916322ab4c7..13950af348c 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -1,7 +1,14 @@
if(NOT OGS_USE_CONAN)
return()
endif()
-find_program(CONAN_CMD conan)
+string(TOLOWER ${OGS_USE_CONAN} OGS_USE_CONAN_lower)
+if(OGS_USE_CONAN_lower STREQUAL "auto" AND POETRY)
+ execute_process(
+ COMMAND poetry add conan=${ogs.minimum_version.conan}
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ )
+endif()
+find_program(CONAN_CMD conan HINTS ${PROJECT_BINARY_DIR}/.venv/bin)
if(NOT CONAN_CMD)
message(WARNING "conan executable not found. Consider installing Conan for "
"automatic third-party library handling. https://www.opengeosys.org/doc"
--
GitLab