From ae42b612feb7c6d1fe72cdb970ef04ddf6c3778c Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 21 Nov 2023 13:38:12 +0100
Subject: [PATCH] [cmake] Disabled Conan for the moment.
---
CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24725b38481..b3343021d9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,16 +76,16 @@ include(PythonSetup)
include(ProcessesSetup)
include(ProjectSetup)
include(Functions)
-include(ConanSetup)
+# include(ConanSetup)
include(CompilerSetup)
include(JobPools)
include(Find)
include(DependenciesExternalProject)
include(Dependencies)
# Hack for Conan (msvc) gui build. Also linking to ${CONAN_LIBS} globally
-if(OGS_USE_CONAN AND OGS_USE_NETCDF)
- link_libraries($<$<BOOL:${WIN32}>:zlib.lib> ${CONAN_LIBS})
-endif()
+#if(OGS_USE_CONAN AND OGS_USE_NETCDF)
+# link_libraries($<$<BOOL:${WIN32}>:zlib.lib> ${CONAN_LIBS})
+#endif()
include(DocumentationSetup)
include(test/Test)
include(Coverage)
--
GitLab