From b7ae3e36e5de39f77ceb4886afbdeb03a5cfba6b Mon Sep 17 00:00:00 2001 From: rtk0c Date: Wed, 7 May 2025 18:24:56 -0700 Subject: Switch to vcpkg --- CMakeLists.txt | 36 ++++++++++++++++++-------------- src/brussel.engine/EditorCorePrivate.cpp | 1 + src/brussel.engine/EditorUtils.cpp | 1 + src/brussel.engine/GameObject.hpp | 1 + src/brussel.engine/Renderer.cpp | 1 + vcpkg.json | 23 ++++++++++++++++++++ 6 files changed, 47 insertions(+), 16 deletions(-) create mode 100644 vcpkg.json diff --git a/CMakeLists.txt b/CMakeLists.txt index fccd775..c96b320 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,18 @@ cmake_minimum_required(VERSION 3.13) project(ProjectBrussel LANGUAGES C CXX) -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(glm REQUIRED) -find_package(stb REQUIRED) +find_package(cxxopts CONFIG REQUIRED) +find_package(robin_hood CONFIG REQUIRED) +find_package(frozen CONFIG REQUIRED) +find_package(unofficial-sqlite3 CONFIG REQUIRED) +find_package(fmt CONFIG REQUIRED) +find_path(PCG_INCLUDE_DIRS "pcg_extras.hpp") +find_package(spdlog CONFIG REQUIRED) +find_package(RapidJSON CONFIG REQUIRED) +find_package(json-dto CONFIG REQUIRED) +find_package(glad CONFIG REQUIRED) +find_package(glm CONFIG REQUIRED) +find_package(Stb REQUIRED) include(cmake/Exceptions.cmake) include(cmake/RTTI.cmake) @@ -42,21 +42,25 @@ set_target_properties(brussel.common PROPERTIES UNITY_BUILD OFF ) -target_include_directories(brussel.common PUBLIC src/brussel.common) +target_include_directories(brussel.common +PUBLIC + src/brussel.common +PRIVATE + ${PCG_INCLUDE_DIRS} + ${Stb_INCLUDE_DIR} +) target_link_libraries(brussel.common PUBLIC # Conan external dependencies cxxopts::cxxopts robin_hood::robin_hood frozen::frozen - SQLite::SQLite3 + unofficial::sqlite3::sqlite3 fmt::fmt - pcg-cpp::pcg-cpp spdlog::spdlog rapidjson json-dto::json-dto glad::glad glm::glm - stb::stb ) file(GLOB_RECURSE brussel_editor_common_SOURCES diff --git a/src/brussel.engine/EditorCorePrivate.cpp b/src/brussel.engine/EditorCorePrivate.cpp index 3efa33c..dae6a6e 100644 --- a/src/brussel.engine/EditorCorePrivate.cpp +++ b/src/brussel.engine/EditorCorePrivate.cpp @@ -31,6 +31,7 @@ #include #include #include +#define GLM_ENABLE_EXPERIMENTAL #include #include #include diff --git a/src/brussel.engine/EditorUtils.cpp b/src/brussel.engine/EditorUtils.cpp index 20caef7..846f57b 100644 --- a/src/brussel.engine/EditorUtils.cpp +++ b/src/brussel.engine/EditorUtils.cpp @@ -5,6 +5,7 @@ #include #include +#define GLM_ENABLE_EXPERIMENTAL #include #include #include diff --git a/src/brussel.engine/GameObject.hpp b/src/brussel.engine/GameObject.hpp index 40c52e7..a0cf40b 100644 --- a/src/brussel.engine/GameObject.hpp +++ b/src/brussel.engine/GameObject.hpp @@ -10,6 +10,7 @@ #include #include +#define GLM_ENABLE_EXPERIMENTAL #include #include #include diff --git a/src/brussel.engine/Renderer.cpp b/src/brussel.engine/Renderer.cpp index 0454efe..6a8a4d2 100644 --- a/src/brussel.engine/Renderer.cpp +++ b/src/brussel.engine/Renderer.cpp @@ -7,6 +7,7 @@ #include #include #include +#define GLM_ENABLE_EXPERIMENTAL #include #include #include diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 0000000..b108d8f --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "dependencies": [ + "cxxopts", + + "robin-hood-hashing", + "frozen", + "sqlite3", + + "pcg", + + "fmt", + "spdlog", + + "rapidjson", + "json-dto", + + "glad", + "glm", + "stb" + ], + "builtin-baseline": "38d9cf0bd45404cd25aeb03f79bcb0af256de343" +} -- cgit v1.2.3-70-g09d2