From 623d32201bcc409727c05fe7f2783f8c08494f1c Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Tue, 5 Sep 2017 14:39:15 +0200 Subject: [PATCH] [CMake] Moved ConanSetup to after CMakeSetup. This makes sure that CMAKE_BUILD_TYPE variable is set which is required by Conan. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0035356e8d5..7dbea09e222 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,11 +31,11 @@ option(OGS_USE_CONAN "Should Conan package manager be used?" OFF) ### CMake includes ### include(scripts/cmake/PreFind.cmake) -include(scripts/cmake/ConanSetup.cmake) include(scripts/cmake/CheckTypeSizes.cmake) include(scripts/cmake/Functions.cmake) include(scripts/cmake/SubmoduleSetup.cmake) include(scripts/cmake/CMakeSetup.cmake) +include(scripts/cmake/ConanSetup.cmake) include(scripts/cmake/CompilerSetup.cmake) include(scripts/cmake/Find.cmake) include(scripts/cmake/CCacheSetup.cmake) -- GitLab