From 2f2d6c226a88254d69d70b8c9082d42fe8a9155d Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 22 Jul 2019 09:37:59 +0200
Subject: [PATCH] [CMake] Added option OGS_CONAN_BUILD_TYPE to overwrite Conan
build type
Can be useful to build / pull Conan release packages when building
OGS in debug mode:
cmake ../ogs -DCMAKE_BUILD_TYPE=Debug -DOGS_CONAN_BUILD_TYPE=Release
---
scripts/cmake/ConanSetup.cmake | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index f43ae95a45f..c28bb036dff 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -127,6 +127,12 @@ else()
message(STATUS "Conan: Skipping update step.")
endif()
+if(DEFINED OGS_CONAN_BUILD_TYPE)
+ set(CONAN_BUILD_TYPE ${OGS_CONAN_BUILD_TYPE})
+else()
+ set(CONAN_BUILD_TYPE ${CMAKE_BUILD_TYPE})
+endif()
+
if(MSVC)
set(CC_CACHE $ENV{CC})
set(CXX_CACHE $ENV{CXX})
@@ -142,6 +148,7 @@ conan_cmake_run(
BUILD ${OGS_CONAN_BUILD}
IMPORTS ${CONAN_IMPORTS}
GENERATORS virtualrunenv
+ BUILD_TYPE ${CONAN_BUILD_TYPE}
)
if(MSVC)
set(ENV{CC} ${CC_CACHE}) # Restore vars
--
GitLab