diff options
| author | rtk0c <[email protected]> | 2025-08-16 11:23:49 -0700 |
|---|---|---|
| committer | rtk0c <[email protected]> | 2025-08-16 11:23:49 -0700 |
| commit | 047f294de1b4d385b811ac9f5afc393d81cc4ae9 (patch) | |
| tree | f96100a813a4ffb28dcd074455d3a2f8ee426430 /CMakeLists.txt | |
| parent | 488fb8b4b9da7f99a5cc37e39fff9f1cb700f2a8 (diff) | |
Copy changes from the no-history fork, generated back in 2023
Original commit message:
> commit f138311d2d2e0cc9ba0496d523bb46f2c1c9fb73
> Author: rtk0c <[email protected]>
> Date: Wed Sep 20 23:58:58 2023 -0700
>
> Copy from the PlasticSCM repo, replace vendored glm wtih conan
In reality, this also introduced a few uncommitted changes in the
original PlasticSCM repo. See the modified and new files in this patch.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8388a7b..dcb4c09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ 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) include(cmake/Exceptions.cmake) @@ -19,7 +20,6 @@ include(cmake/Win32Subsystem.cmake) find_package(OpenGL REQUIRED) add_subdirectory(3rdparty/glfw) -add_subdirectory(3rdparty/glm) add_subdirectory(3rdparty/imgui) add_subdirectory(3rdparty/imguicolortextedit) add_subdirectory(3rdparty/tracy) @@ -55,9 +55,8 @@ target_link_libraries(10-common PUBLIC rapidjson json-dto::json-dto glad::glad - stb::stb - # Vendored external dependencies glm::glm + stb::stb ) file(GLOB_RECURSE 10-editor-common_SOURCES @@ -244,7 +243,6 @@ target_link_libraries(30-game PRIVATE # Vendored external dependencies OpenGL::GL glfw - glm::glm imgui ImGuiColorTextEdit tracy |