File: 09_fix-pkgconfig.patch

package info (click to toggle)
libsfml 3.0.1%2Bdfsg-1
  • links: PTS, VCS
  • area: main
  • in suites: experimental
  • size: 13,704 kB
  • sloc: cpp: 52,754; ansic: 24,944; objc: 668; sh: 172; xml: 25; makefile: 18
file content (36 lines) | stat: -rw-r--r-- 1,373 bytes parent folder | download
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
Description: Fix pkg-config when SFML_PKGCONFIG_INSTALL_DIR is unset
 Commit e5127715e64a ("Install pkgconfig only if module is built")
 attempted to move the pkg-config installation rules into
 `sfml_add_library`, but this fails if `SFML_PKGCONFIG_INSTALL_DIR` is
 unset because this code is run before the default value is set in
 `CMakeLists.txt`.
 .
 Fix by moving the `add_subdirectory(src/SFML)` line below the
 pkg-config setup code.
Origin: https://github.com/SFML/SFML/commit/a87763becbc4672b38f1021418ed94caa0f6540a
Author: James Cowgill <jcowgill@debian.org>
Bug: https://github.com/SFML/SFML/issues/3504
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,9 +201,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PRO
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake")
 
-# add the subdirectories
-add_subdirectory(src/SFML)
-
 # on Linux and BSD-like OS, install pkg-config files by default
 set(SFML_INSTALL_PKGCONFIG_DEFAULT OFF)
 
@@ -248,6 +245,9 @@ if(SFML_ENABLE_PCH AND SFML_OS_MACOS)
     message(FATAL_ERROR "Precompiled headers are currently not supported in macOS builds")
 endif()
 
+# add the subdirectories
+add_subdirectory(src/SFML)
+
 # setup the install rules
 if(NOT SFML_BUILD_FRAMEWORKS)
     install(DIRECTORY include/