blob: da52f0267f7779954794c1c952ad6cb417513c19 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
From 7efb73d1a964f04646dba692323c1affcb25d16e Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flow@gentoo.org>
Date: Fri, 8 Oct 2021 11:07:20 +0200
Subject: [PATCH] Make CMake call find_package(glm)
---
CMakeLists.txt | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fb5c88f6614..9d65d1ef2653 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,17 +106,7 @@ if(WITH_DISCORD)
endif()
# GLM
-set(GLM_BASE_PATH "${EXTERNALS_DIR}")
-
-if(NOT EXISTS "${GLM_BASE_PATH}/glm/CMakeLists.txt")
- set(GLM_ZIP "${DOWNLOADS_DIR}/glm.zip")
- file(DOWNLOAD "https://github.com/g-truc/glm/releases/download/0.9.9.8/glm-0.9.9.8.zip" "${GLM_ZIP}" TIMEOUT 60 TLS_VERIFY ON)
-
- file(MAKE_DIRECTORY "${GLM_BASE_PATH}/glm")
- execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf "${GLM_ZIP}" WORKING_DIRECTORY "${GLM_BASE_PATH}")
-endif()
-
-add_subdirectory("${GLM_BASE_PATH}/glm" "${PROJECT_BINARY_DIR}/glm" EXCLUDE_FROM_ALL)
+find_package(glm)
set(SOURCES
src/main.cpp
--
2.32.0
|
