aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrtk0c <[email protected]>2025-05-07 18:24:56 -0700
committerrtk0c <[email protected]>2025-05-07 18:24:56 -0700
commit08932935c407a421f8ca5a6fb35e3c567bbba562 (patch)
tree02035bc656d2e65ebd870c0e69ae1d4e99092e48
parent7151b0e5bcabb0216e79e742ae13c4f429ec2011 (diff)
Switch to vcpkg
-rw-r--r--CMakeLists.txt36
-rw-r--r--src/brussel.engine/EditorCorePrivate.cpp1
-rw-r--r--src/brussel.engine/EditorUtils.cpp1
-rw-r--r--src/brussel.engine/GameObject.hpp1
-rw-r--r--src/brussel.engine/Renderer.cpp1
-rw-r--r--vcpkg.json23
6 files changed, 47 insertions, 16 deletions
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 <cstdint>
#include <cstdlib>
#include <functional>
+#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtc/quaternion.hpp>
#include <glm/gtc/type_ptr.hpp>
#include <glm/gtx/quaternion.hpp>
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 <backends/imgui_impl_glfw.h>
#include <cmath>
+#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtc/quaternion.hpp>
#include <glm/gtx/quaternion.hpp>
#include <numbers>
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 <rapidjson/fwd.h>
#include <glm/glm.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtc/quaternion.hpp>
#include <span>
#include <vector>
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 <rapidjson/document.h>
#include <cassert>
#include <glm/gtc/matrix_transform.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtc/quaternion.hpp>
#include <glm/gtx/quaternion.hpp>
#include <string_view>
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"
+}