From 2da62bd98c676cb3a769933d94764edb454e8a40 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 5 Oct 2020 11:44:20 +0200
Subject: [PATCH] [CMake] Enforce Conan location on OGS_USE_CONAN=auto
---
scripts/cmake/ConanSetup.cmake | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index 5c07f1f8dea..9b2cb255cc7 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -9,8 +9,12 @@ if(OGS_USE_CONAN_lower STREQUAL "auto" AND POETRY)
${PROJECT_BINARY_DIR}/.venv/Scripts
REQUIRED NO_DEFAULT_PATH
)
+ find_program(CONAN_CMD conan HINTS ${PROJECT_BINARY_DIR}/.venv/bin
+ REQUIRED NO_DEFAULT_PATH
+ )
+else()
+ find_program(CONAN_CMD conan)
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