From 434a274cc8b85cfb37309c0ac1b1470ed930d30f Mon Sep 17 00:00:00 2001 From: rtk0c Date: Thu, 15 Jun 2023 18:13:43 -0700 Subject: Changeset: 97 Migreate to conan2 --- CMakeLists.txt | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index c66e94d..8388a7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,17 @@ cmake_minimum_required(VERSION 3.13) project(ProjectBrussel LANGUAGES C CXX) -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() +find_package(cxxopts REQUIRED) +find_package(robin_hood REQUIRED) +find_package(frozen REQUIRED) +find_package(SQLite3 REQUIRED) +find_package(fmt REQUIRED) +find_package(pcg-cpp REQUIRED) +find_package(spdlog REQUIRED) +find_package(RapidJSON REQUIRED) +find_package(json-dto REQUIRED) +find_package(glad REQUIRED) +find_package(stb REQUIRED) include(cmake/Exceptions.cmake) include(cmake/RTTI.cmake) @@ -35,8 +44,19 @@ set_target_properties(10-common PROPERTIES target_include_directories(10-common PUBLIC source/10-common) target_link_libraries(10-common PUBLIC - # External dependencies - ${CONAN_LIBS} + # Conan external dependencies + cxxopts::cxxopts + robin_hood::robin_hood + frozen::frozen + SQLite::SQLite3 + fmt::fmt + pcg-cpp::pcg-cpp + spdlog::spdlog + rapidjson + json-dto::json-dto + glad::glad + stb::stb + # Vendored external dependencies glm::glm ) @@ -55,9 +75,7 @@ set_target_properties(10-editor-common PROPERTIES target_include_directories(10-editor-common PUBLIC source/10-editor-common) target_link_libraries(10-editor-common PUBLIC - # External dependencies - ${CONAN_LIBS} - glm::glm + # Vendored eternal dependencies imgui # Project internal components @@ -81,9 +99,6 @@ set_target_properties(20-codegen-runtime PROPERTIES target_include_directories(20-codegen-runtime PUBLIC source/20-codegen-runtime) target_link_libraries(20-codegen-runtime PUBLIC - # External dependencies - ${CONAN_LIBS} - # Project internal components 10-common ) @@ -102,9 +117,6 @@ set_target_properties(20-codegen-compiler PROPERTIES ) target_link_libraries(20-codegen-compiler PRIVATE - # External dependencies - ${CONAN_LIBS} - # Project internal components 10-common ) @@ -229,8 +241,7 @@ target_compile_definitions(30-game PRIVATE ) target_link_libraries(30-game PRIVATE - # External dependencies - ${CONAN_LIBS} + # Vendored external dependencies OpenGL::GL glfw glm::glm -- cgit v1.2.3-70-g09d2