diff --git a/CMakeLists.txt b/CMakeLists.txt index 24725b384810fb12bad1e7ed938e8b4b019c7f97..b3343021d9dfe8d0f8a150f5b9ce539c44babffa 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)