diff options
| -rw-r--r-- | CMakeLists.txt | 41 | ||||
| -rw-r--r-- | conanfile.py | 28 | ||||
| -rw-r--r-- | conanfile.txt | 19 | ||||
| -rw-r--r-- | ignore.conf | 2 |
4 files changed, 56 insertions, 34 deletions
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 diff --git a/conanfile.py b/conanfile.py new file mode 100644 index 0000000..65ae0dc --- /dev/null +++ b/conanfile.py @@ -0,0 +1,28 @@ +from conan import ConanFile + +class ProjectBrussel(ConanFile): + settings = "os", "compiler", "build_type", "arch" + generators = "CMakeDeps", "CMakeToolchain" + default_options = { + "glad/*:no_loader": True, + "glad/*:gl_version": "4.5", + } + + def requirements(self): + self.requires("cxxopts/3.1.1") + + self.requires("robin-hood-hashing/3.11.5") + self.requires("frozen/1.1.1") + self.requires("sqlite3/3.42.0") + + self.requires("pcg-cpp/cci.20220409") + + self.requires("fmt/9.1.0") + self.requires("spdlog/1.11.0") + + self.requires("rapidjson/cci.20220822", override=True) + self.requires("json_dto/0.3.1") + + self.requires("glad/0.1.34") + self.requires("stb/cci.20220909") + # self.requires("assimp/5.2.2") diff --git a/conanfile.txt b/conanfile.txt deleted file mode 100644 index 3b3a0c1..0000000 --- a/conanfile.txt +++ /dev/null @@ -1,19 +0,0 @@ -[requires] -fmt/9.0.0 -spdlog/1.10.0 -cxxopts/3.0.0 -glad/0.1.34 -assimp/5.2.2 -rapidjson/cci.20211112 -json_dto/0.3.1 -stb/cci.20210910 -robin-hood-hashing/3.11.5 -frozen/1.1.1 -sqlite3/3.38.5 - -[generators] -cmake - -[options] -glad:no_loader=True -glad:gl_version=4.5 diff --git a/ignore.conf b/ignore.conf index 57f0d4e..b4432ab 100644 --- a/ignore.conf +++ b/ignore.conf @@ -1,5 +1,6 @@ build build.scripts +run .vscode .vs .idea @@ -10,6 +11,7 @@ _ReSharper.Caches imgui.ini project.4coder CMakeSettings.json +CMakeUserPresets.json build-Clion-debug build-Clion-release |