From ecf785f40545a5702b1809d1572b61942c6cd0df Mon Sep 17 00:00:00 2001 From: Eidolon <furyhunter600@gmail.com> Date: Thu, 23 Mar 2023 11:19:26 -0500 Subject: [PATCH] Add glm CPM dependency --- src/CMakeLists.txt | 1 + thirdparty/CMakeLists.txt | 1 + thirdparty/cpm-glm.cmake | 13 +++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 thirdparty/cpm-glm.cmake diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d1faeb04e0..d7f4c7705b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -235,6 +235,7 @@ target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_DISCORDRPC -DUSE_STUN) target_sources(SRB2SDL2 PRIVATE discord.c stun.c) target_link_libraries(SRB2SDL2 PRIVATE tcbrindle::span) +target_link_libraries(SRB2SDL2 PRIVATE glm) target_link_libraries(SRB2SDL2 PRIVATE stb_rect_pack) target_link_libraries(SRB2SDL2 PRIVATE stb_vorbis) target_link_libraries(SRB2SDL2 PRIVATE xmp-lite::xmp-lite) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index 5fc7bf5d60..6cfd454756 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -17,6 +17,7 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") include("cpm-libgme.cmake") endif() +include("cpm-glm.cmake") include("cpm-rapidjson.cmake") include("cpm-discordrpc.cmake") include("cpm-xmp-lite.cmake") diff --git a/thirdparty/cpm-glm.cmake b/thirdparty/cpm-glm.cmake new file mode 100644 index 0000000000..a69e2faa59 --- /dev/null +++ b/thirdparty/cpm-glm.cmake @@ -0,0 +1,13 @@ +CPMAddPackage( + NAME glm + VERSION 0.9.9.8 + URL "https://github.com/g-truc/glm/releases/download/0.9.9.8/glm-0.9.9.8.zip" + EXCLUDE_FROM_ALL ON + DOWNLOAD_ONLY ON +) + +if(glm_ADDED) + add_library(glm INTERFACE) + add_library(glm::glm ALIAS glm) + target_include_directories(glm INTERFACE "${glm_SOURCE_DIR}") +endif() -- GitLab