Skip to content

Commit

Permalink
[#83] Move conan processing to the root cmakelists
Browse files Browse the repository at this point in the history
Conan CONAN_PKG:: imported targets are not defined as global, so they
should be included in the main CMakeLists.txt file to be available in
the whole sourcetree, not just under 3rdParty
  • Loading branch information
Manu343726 committed Dec 28, 2016
1 parent 0e6f065 commit e59db65
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
9 changes: 0 additions & 9 deletions 3rdParty/CMakeLists.txt
@@ -1,15 +1,6 @@
include(thirdparty)
include(pip)

execute_process(
COMMAND conan install --build=outdated
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)

include(conanbuildinfo.cmake)
conan_basic_setup()
include(${CONAN_CMAKE-UTILS_ROOT}/conan.cmake)

add_conan_library(ctti)
add_conan_library(nljson)
add_conan_library(fmt)
Expand Down
9 changes: 9 additions & 0 deletions 3rdParty/conan.cmake
@@ -0,0 +1,9 @@
execute_process(
COMMAND conan install --build=outdated --file "${CMAKE_SOURCE_DIR}/3rdParty/conanfile.txt"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)

include(${CMAKE_SOURCE_DIR}/3rdParty/conanbuildinfo.cmake)
conan_basic_setup()
conan_define_targets()
include(${CONAN_CMAKE-UTILS_ROOT}/conan.cmake)
1 change: 1 addition & 0 deletions CMakeLists.txt
Expand Up @@ -36,6 +36,7 @@ option(SIPLASPLAS_IMGUI_SFML_EXAMPLES_ENABLED "Enable examples using imgui and S
option(SIPLASPLAS_VERBOSE_DRLPARSER "Run reflection parser with detailed diagnostics" OFF)

include(cmake/siplasplas.cmake)
include(3rdParty/conan.cmake)

add_subdirectory(cmake)
add_subdirectory(3rdParty)
Expand Down

0 comments on commit e59db65

Please sign in to comment.