Skip to content

Commit

Permalink
[CMake] Moved ConanSetup to after CMakeSetup.
Browse files Browse the repository at this point in the history
This makes sure that CMAKE_BUILD_TYPE variable is set which is
required by Conan.
  • Loading branch information
bilke committed Sep 6, 2017
1 parent 1f095da commit decf9f7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit decf9f7

Please sign in to comment.