Skip to content
Snippets Groups Projects
Commit 623d3220 authored by Lars Bilke's avatar Lars Bilke
Browse files

[CMake] Moved ConanSetup to after CMakeSetup.

This makes sure that CMAKE_BUILD_TYPE variable is set which is
required by Conan.
parent c53869bf
No related branches found
No related tags found
No related merge requests found
...@@ -31,11 +31,11 @@ option(OGS_USE_CONAN "Should Conan package manager be used?" OFF) ...@@ -31,11 +31,11 @@ option(OGS_USE_CONAN "Should Conan package manager be used?" OFF)
### CMake includes ### ### CMake includes ###
include(scripts/cmake/PreFind.cmake) include(scripts/cmake/PreFind.cmake)
include(scripts/cmake/ConanSetup.cmake)
include(scripts/cmake/CheckTypeSizes.cmake) include(scripts/cmake/CheckTypeSizes.cmake)
include(scripts/cmake/Functions.cmake) include(scripts/cmake/Functions.cmake)
include(scripts/cmake/SubmoduleSetup.cmake) include(scripts/cmake/SubmoduleSetup.cmake)
include(scripts/cmake/CMakeSetup.cmake) include(scripts/cmake/CMakeSetup.cmake)
include(scripts/cmake/ConanSetup.cmake)
include(scripts/cmake/CompilerSetup.cmake) include(scripts/cmake/CompilerSetup.cmake)
include(scripts/cmake/Find.cmake) include(scripts/cmake/Find.cmake)
include(scripts/cmake/CCacheSetup.cmake) include(scripts/cmake/CCacheSetup.cmake)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment