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 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188
|
From: akallabeth <akallabeth@posteo.net>
Date: Sun, 21 Sep 2025 19:06:58 +0200
Subject: [cmake,pkg-config] properly set requires fields
Forwarded: not-needed
Origin: https://github.com/FreeRDP/FreeRDP/commit/74a3a7695cdd09cf020acdeb09480ac8ee92ccbe
---
client/CMakeLists.txt | 1 +
client/freerdp-client.pc.in | 2 +-
libfreerdp/CMakeLists.txt | 1 +
libfreerdp/freerdp.pc.in | 2 +-
server/CMakeLists.txt | 1 +
server/freerdp-server.pc.in | 2 +-
server/proxy/CMakeLists.txt | 1 +
server/proxy/freerdp-proxy.pc.in | 2 +-
server/proxy/modules/freerdp-proxy-module.pc.in | 2 +-
server/shadow/CMakeLists.txt | 1 +
server/shadow/freerdp-shadow.pc.in | 2 +-
winpr/tools/CMakeLists.txt | 1 +
winpr/tools/winpr-tools.pc.in | 2 +-
13 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index c266afd92..6194f385b 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -119,6 +119,7 @@ if(BUILD_SHARED_LIBS)
set(FREERDP_CLIENT_PC_REQUIRES_PRIVATE "")
set(FREERDP_CLIENT_PC_LIBRARY_PRIVATE "")
endif()
+set(FREERDP_CLIENT_PC_REQUIRES freerdp${FREERDP_API_VERSION})
include(pkg-config-install-prefix)
cleaning_configure_file(
diff --git a/client/freerdp-client.pc.in b/client/freerdp-client.pc.in
index 19192553e..a0a22d033 100644
--- a/client/freerdp-client.pc.in
+++ b/client/freerdp-client.pc.in
@@ -8,7 +8,7 @@ Name: FreeRDP client
Description: FreeRDP: A Remote Desktop Protocol Implementation
URL: http://www.freerdp.com/
Version: @FREERDP_VERSION@
-Requires:
+Requires: @FREERDP_CLIENT_PC_REQUIRES@
Requires.private: @FREERDP_CLIENT_PC_REQUIRES_PRIVATE@
Libs: -L${libdir} ${libs}
Libs.private: @FREERDP_CLIENT_PC_LIBRARY_PRIVATE@
diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
index 538b445a1..66722c3b3 100644
--- a/libfreerdp/CMakeLists.txt
+++ b/libfreerdp/CMakeLists.txt
@@ -284,6 +284,7 @@ if(BUILD_SHARED_LIBS)
set(FREERDP_PC_REQUIRES_PRIVATE "")
set(FREERDP_PC_LIBRARY_PRIVATE "")
endif()
+set(FREERDP_PC_REQUIRES winpr${FREERDP_API_VERSION})
cleaning_configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/freerdp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp${FREERDP_VERSION_MAJOR}.pc @ONLY
diff --git a/libfreerdp/freerdp.pc.in b/libfreerdp/freerdp.pc.in
index 1c0daa3b7..2a3383d88 100644
--- a/libfreerdp/freerdp.pc.in
+++ b/libfreerdp/freerdp.pc.in
@@ -13,7 +13,7 @@ Name: FreeRDP
Description: FreeRDP: A Remote Desktop Protocol Implementation
URL: http://www.freerdp.com/
Version: @FREERDP_VERSION@
-Requires:
+Requires: @FREERDP_PC_REQUIRES@
Requires.private: @FREERDP_PC_REQUIRES_PRIVATE@
Libs: -L${libdir} ${libs}
Libs.private: -L${plugindir} @FREERDP_PC_LIBRARY_PRIVATE@
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 90e27d8b4..1056b33ec 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -82,6 +82,7 @@ if(NOT BUILD_SHARED_LIBS)
set(FREERDP_SERVER_PC_REQUIRES_PRIVATE "freerdp${FREERDP_API_VERSION}")
set(FREERDP_SERVER_PC_LIBRARY_PRIVATE "-ldl -lpthread")
endif()
+set(FREERDP_SERVER_PC_REQUIRES freerdp${FREERDP_API_VERSION})
include(pkg-config-install-prefix)
cleaning_configure_file(
diff --git a/server/freerdp-server.pc.in b/server/freerdp-server.pc.in
index 75666b945..31c2c33d2 100644
--- a/server/freerdp-server.pc.in
+++ b/server/freerdp-server.pc.in
@@ -8,7 +8,7 @@ Name: FreeRDP server
Description: FreeRDP: A Remote Desktop Protocol Implementation
URL: http://www.freerdp.com/
Version: @FREERDP_VERSION@
-Requires:
+Requires: @FREERDP_SERVER_PC_REQUIRES@
Requires.private: @FREERDP_SERVER_PC_REQUIRES_PRIVATE@
Libs: -L${libdir} ${libs}
Libs.private: @FREERDP_SERVER_PC_LIBRARY_PRIVATE@
diff --git a/server/proxy/CMakeLists.txt b/server/proxy/CMakeLists.txt
index 1a31d6535..53ac9b051 100644
--- a/server/proxy/CMakeLists.txt
+++ b/server/proxy/CMakeLists.txt
@@ -82,6 +82,7 @@ if(NOT BUILD_SHARED_LIBS)
set(FREERDP_PROXY_PC_REQUIRES_PRIVATE "freerdp-client${FREERDP_API_VERSION} freerdp-server${FREERDP_API_VERSION}")
set(FREERDP_PROXY_PC_LIBS_PRIVATE "-ldl -lpthread")
endif()
+set(FREERDP_PROXY_PC_REQUIRES freerdp-server${FREERDP_API_VERSION})
include(pkg-config-install-prefix)
cleaning_configure_file(
diff --git a/server/proxy/freerdp-proxy.pc.in b/server/proxy/freerdp-proxy.pc.in
index 7b3e0e9a7..e1023ed72 100644
--- a/server/proxy/freerdp-proxy.pc.in
+++ b/server/proxy/freerdp-proxy.pc.in
@@ -8,7 +8,7 @@ Name: FreeRDP proxy
Description: FreeRDP: A Remote Desktop Protocol Implementation
URL: http://www.freerdp.com/
Version: @FREERDP_VERSION@
-Requires:
+Requires: @FREERDP_PROXY_PC_REQUIRES@
Requires.private: @FREERDP_PROXY_PC_REQUIRES_PRIVATE@
Libs: -L${libdir} ${libs}
Libs.private: @FREERDP_PROXY_PC_LIBS_PRIVATE@
diff --git a/server/proxy/modules/freerdp-proxy-module.pc.in b/server/proxy/modules/freerdp-proxy-module.pc.in
index 0cb09dc85..cc3e71ee4 100644
--- a/server/proxy/modules/freerdp-proxy-module.pc.in
+++ b/server/proxy/modules/freerdp-proxy-module.pc.in
@@ -9,7 +9,7 @@ Name: @PROJECT_NAME@
Description: FreeRDP proxy module
URL: http://www.freerdp.com/
Version: @PROJECT_VERSION@
-Requires:
+Requires: @PROJECT_PC_REQUIRES@
Requires.private: @PROJECT_PC_REQUIRES_PRIVATE@
Libs: -L${libdir}
Libs.private: -Wl,--whole-archive \${proxy_plugindir}/@PROJECT_LIBRARY_NAME@ -u @PROJECT_SHORT_NAME_UNDERSCORE@_proxy_module_entry_point -Wl,--no-whole-archive
diff --git a/server/shadow/CMakeLists.txt b/server/shadow/CMakeLists.txt
index 1fbfccf18..758d6d2cd 100644
--- a/server/shadow/CMakeLists.txt
+++ b/server/shadow/CMakeLists.txt
@@ -166,6 +166,7 @@ if(NOT BUILD_SHARED_LIBS)
set(FREERDP_SHADOW_PC_REQUIRES_PRIVATE "freerdp${FREERDP_API_VERSION}")
set(FREERDP_SHADOW_PC_LIBRARY_PRIVATE "-ldl -lpthread")
endif()
+set(FREERDP_SHADOW_PC_REQUIRES freerdp-server${FREERDP_API_VERSION})
include(pkg-config-install-prefix)
cleaning_configure_file(
diff --git a/server/shadow/freerdp-shadow.pc.in b/server/shadow/freerdp-shadow.pc.in
index 2e187bc9d..242089a41 100644
--- a/server/shadow/freerdp-shadow.pc.in
+++ b/server/shadow/freerdp-shadow.pc.in
@@ -8,7 +8,7 @@ Name: FreeRDP shadow
Description: FreeRDP: A Remote Desktop Protocol Implementation
URL: http://www.freerdp.com/
Version: @FREERDP_VERSION@
-Requires:
+Requires: @FREERDP_SHADOW_PC_REQUIRES@
Requires.private: @FREERDP_SHADOW_PC_REQUIRES_PRIVATE@
Libs: -L${libdir} ${libs}
Libs.private: @FREERDP_SHADOW_PC_LIBRARY_PRIVATE@
diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt
index c7bf4b083..976a78a11 100644
--- a/winpr/tools/CMakeLists.txt
+++ b/winpr/tools/CMakeLists.txt
@@ -123,6 +123,7 @@ if(NOT BUILD_SHARED_LIBS)
set(WINPR_TOOLS_PC_REQUIRES_PRIVATE "winpr${WINPR_API_VERSION} libssl")
set(WINPR_TOOLS_PC_LIBRARY_PRIVATE "crypto")
endif()
+set(WINPR_TOOLS_PC_REQUIRES winpr${WINPR_API_VERSION})
include(pkg-config-install-prefix)
cleaning_configure_file(
diff --git a/winpr/tools/winpr-tools.pc.in b/winpr/tools/winpr-tools.pc.in
index 4360d3c2b..9502fc60f 100644
--- a/winpr/tools/winpr-tools.pc.in
+++ b/winpr/tools/winpr-tools.pc.in
@@ -8,7 +8,7 @@ Name: WinPR
Description: WinPR: Windows Portable Runtime
URL: http://www.freerdp.com/
Version: @WINPR_TOOLS_VERSION@
-Requires:
+Requires: @WINPR_TOOLS_PC_REQUIRES@
Requires.private: @WINPR_TOOLS_PC_REQUIRES_PRIVATE@
Libs: -L${libdir} ${libs}
Libs.private: @WINPR_TOOLS_PC_LIBRARY_PRIVATE@
--
2.47.3
|