Skip to content

Commit 7fd3862

Browse files
committed
Removed deprecated CMake functions and removed unused link
(There is no glm library to link, only header files to include)
1 parent 9e6f7d5 commit 7fd3862

1 file changed

Lines changed: 19 additions & 40 deletions

File tree

CMakeLists.txt

Lines changed: 19 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -10,57 +10,36 @@ set(CMAKE_CXX_STANDARD 20)
1010
#
1111

1212
# GLFW
13-
find_package(glfw3 3.4 QUIET)
14-
if (NOT glfw3_FOUND)
15-
FetchContent_Declare(
16-
glfw3
17-
DOWNLOAD_EXTRACT_TIMESTAMP OFF
18-
URL https://github.com/glfw/glfw/releases/download/3.4/glfw-3.4.zip
19-
)
20-
FetchContent_GetProperties(glfw3)
21-
if (NOT glfw3_POPULATED)
22-
set(FETCHCONTENT_QUIET NO)
23-
FetchContent_Populate(glfw3)
24-
add_subdirectory(${glfw3_SOURCE_DIR} ${glfw3_BINARY_DIR})
25-
endif()
26-
endif()
13+
FetchContent_Declare(
14+
glfw
15+
GIT_REPOSITORY https://github.com/glfw/glfw.git
16+
GIT_TAG 3.4
17+
FIND_PACKAGE_ARGS NAMES glfw3
18+
)
19+
FetchContent_MakeAvailable(glfw)
2720

2821
# OpenGL
2922
find_package(OpenGL REQUIRED)
3023

3124
# GLAD
3225
FetchContent_Declare(
3326
glad
34-
DOWNLOAD_EXTRACT_TIMESTAMP OFF
35-
URL https://github.com/Dav1dde/glad/archive/refs/tags/v2.0.8.zip
27+
GIT_REPOSITORY https://github.com/Dav1dde/glad.git
28+
GIT_TAG v2.0.8
3629
)
30+
FetchContent_MakeAvailable(glad)
3731

38-
FetchContent_GetProperties(glad)
39-
if(NOT glad_POPULATED)
40-
set(FETCHCONTENT_QUIET NO)
41-
FetchContent_MakeAvailable(glad)
42-
43-
add_subdirectory("${glad_SOURCE_DIR}/cmake" glad_cmake)
44-
glad_add_library(glad REPRODUCIBLE EXCLUDE_FROM_ALL LOADER API gl:core=4.6)
45-
endif()
46-
set_target_properties(glad PROPERTIES FOLDER "Dependencies")
32+
add_subdirectory("${glad_SOURCE_DIR}/cmake" glad_cmake)
33+
glad_add_library(glad REPRODUCIBLE EXCLUDE_FROM_ALL LOADER API gl:core=4.6)
4734

4835
# GLM
49-
find_package(glm 1.0.1 QUIET)
50-
if (NOT glm_FOUND)
51-
FetchContent_Declare(
52-
glm
53-
DOWNLOAD_EXTRACT_TIMESTAMP OFF
54-
URL https://github.com/g-truc/glm/archive/refs/tags/1.0.1.zip
55-
)
56-
FetchContent_GetProperties(glm)
57-
if (NOT glm_POPULATED)
58-
set(FETCHCONTENT_QUIET NO)
59-
FetchContent_Populate(glm)
60-
add_subdirectory(${glm_SOURCE_DIR} ${glm_BINARY_DIR})
61-
endif()
62-
endif()
63-
set_target_properties(glm PROPERTIES FOLDER "Dependencies")
36+
FetchContent_Declare(
37+
glm
38+
GIT_REPOSITORY https://github.com/g-truc/glm.git
39+
GIT_TAG 1.0.1
40+
FIND_PACKAGE_ARGS
41+
)
42+
FetchContent_MakeAvailable(glm)
6443

6544
#
6645
# Projects

0 commit comments

Comments
 (0)