diff --git a/3rdParty/CMakeLists.txt b/3rdParty/CMakeLists.txt index 5c4931b..56b4665 100644 --- a/3rdParty/CMakeLists.txt +++ b/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) diff --git a/3rdParty/conan.cmake b/3rdParty/conan.cmake new file mode 100644 index 0000000..8ac79a1 --- /dev/null +++ b/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) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a0cfe5..65ac3de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)