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
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
From 115ae712d576deafaa95dc5227a7f83dce92a9cb Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sun, 31 May 2020 21:59:06 +0100
Subject: [PATCH 1/2] Drop unused FreeType dependency
It may be used by FTGL but it's not directly used by this
project. pkg-config should handle this for static builds.
---
src/CMakeLists.txt | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f54b126f..8dab39fc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -103,7 +103,6 @@ find_package(SFML COMPONENTS ${SFML_FIND_COMPONENTS} REQUIRED)
find_package(FTGL REQUIRED)
find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
-find_package(Freetype REQUIRED)
find_package(CURL REQUIRED)
find_package(Lua REQUIRED)
find_package(fmt CONFIG REQUIRED)
@@ -111,7 +110,6 @@ include_directories(
${FREEIMAGE_INCLUDE_DIR}
${SFML_INCLUDE_DIR}
${FTGL_INCLUDE_DIR}
- ${FREETYPE_INCLUDE_DIRS}
${GLEW_INCLUDE_PATH}
${CURL_INCLUDE_DIR}
${LUA_INCLUDE_DIR}
@@ -184,7 +182,6 @@ target_link_libraries(slade
${SFML_LIBRARY}
${FTGL_LIBRARIES}
${OPENGL_LIBRARIES}
- ${FREETYPE_LIBRARIES}
${GLEW_LIBRARY}
${CURL_LIBRARIES}
${LUA_LIBRARIES}
--
2.26.2
From 9116972a75b58ef32e229842f80cdc96fab04f1e Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sun, 31 May 2020 22:00:53 +0100
Subject: [PATCH 2/2] Only require FTGL when USE_SFML_RENDERWINDOW is disabled
---
src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8dab39fc..b0d4776d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -72,6 +72,7 @@ set(SFML_FIND_COMPONENTS system audio window graphics network)
ADD_DEFINITIONS(-DUSE_SFML_RENDERWINDOW)
else (USE_SFML_RENDERWINDOW)
set(SFML_FIND_COMPONENTS system audio window network)
+find_package(FTGL REQUIRED)
endif(USE_SFML_RENDERWINDOW)
# Fluidsynth
@@ -100,7 +101,6 @@ endif()
find_package(FreeImage REQUIRED)
find_package(SFML COMPONENTS ${SFML_FIND_COMPONENTS} REQUIRED)
-find_package(FTGL REQUIRED)
find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
find_package(CURL REQUIRED)
--
2.26.2
|
GitWeb
