pyrox.dev
lol
performous: fix build
+88
+2
pkgs/games/performous/default.nix
+2
pkgs/games/performous/default.nix
+86
pkgs/games/performous/performous-cmake.patch
+86
pkgs/games/performous/performous-cmake.patch
···
1
+
--- a/CMakeLists.txt
2
+
+++ b/CMakeLists.txt
3
+
@@ -1,4 +1,4 @@
4
+
-cmake_minimum_required(VERSION 2.8)
5
+
+cmake_minimum_required(VERSION 3.6)
6
+
project(Performous CXX C)
7
+
8
+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
9
+
--- a/cmake/Modules/FindPango.cmake
10
+
+++ b/cmake/Modules/FindPango.cmake
11
+
@@ -2,31 +2,10 @@
12
+
# Once done, this will define
13
+
#
14
+
# Pango_FOUND - system has Pango
15
+
-# Pango_INCLUDE_DIRS - the Pango include directories
16
+
# Pango_LIBRARIES - link these to use Pango
17
+
18
+
include(LibFindMacros)
19
+
20
+
-# Dependencies
21
+
-libfind_package(Pango Freetype)
22
+
-libfind_package(Pango Glib)
23
+
-libfind_package(Pango GObject)
24
+
-
25
+
-# Use pkg-config to get hints about paths
26
+
-libfind_pkg_check_modules(Pango_PKGCONF pango)
27
+
-
28
+
-# Include dir
29
+
-find_path(Pango_INCLUDE_DIR
30
+
- NAMES pango/pango.h
31
+
- HINTS ${Pango_PKGCONF_INCLUDE_DIRS}
32
+
- PATH_SUFFIXES pango-1.0
33
+
-)
34
+
-
35
+
-# Finally the library itself
36
+
-find_library(Pango_LIBRARY
37
+
- NAMES pango-1.0
38
+
- HINTS ${Pango_PKGCONF_LIBRARY_DIRS}
39
+
-)
40
+
-
41
+
+libfind_pkg_check_modules(Pango_PKGCONF IMPORTED_TARGET pango)
42
+
+set(Pango_LIBRARY PkgConfig::Pango_PKGCONF)
43
+
libfind_process(Pango)
44
+
-
45
+
--- a/cmake/Modules/FindPangoCairo.cmake
46
+
+++ b/cmake/Modules/FindPangoCairo.cmake
47
+
@@ -1,35 +1,11 @@
48
+
# - Try to find PangoCairo
49
+
# Once done, this will define
50
+
#
51
+
-# PangoCairo_FOUND - system has Pango
52
+
-# PangoCairo_INCLUDE_DIRS - the Pango include directories
53
+
-# PangoCairo_LIBRARIES - link these to use Pango
54
+
+# PangoCairo_FOUND - system has PangoCairo
55
+
+# PangoCairo_LIBRARIES - link these to use PangoCairo
56
+
57
+
include(LibFindMacros)
58
+
59
+
-# Dependencies
60
+
-libfind_package(PangoCairo Pango)
61
+
-libfind_package(PangoCairo Cairo)
62
+
-
63
+
-# Use pkg-config to get hints about paths
64
+
-libfind_pkg_check_modules(PangoCairo_PKGCONF pangocairo)
65
+
-
66
+
-# Include dir
67
+
-find_path(PangoCairo_INCLUDE_DIR
68
+
- NAMES pango/pangocairo.h
69
+
- HINTS ${PangoCairo_PKGCONF_INCLUDE_DIRS}
70
+
- PATH_SUFFIXES pango-1.0
71
+
-)
72
+
-
73
+
-# Finally the library itself
74
+
-find_library(PangoCairo_LIBRARY
75
+
- NAMES pangocairo-1.0
76
+
- HINTS ${PangoCairo_PKGCONF_LIBRARY_DIRS}
77
+
-)
78
+
-
79
+
-# Set the include dir variables and the libraries and let libfind_process do the rest.
80
+
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
81
+
-set(PangoCairo_PROCESS_INCLUDES PangoCairo_INCLUDE_DIR Pango_INCLUDE_DIR Cairo_INCLUDE_DIR)
82
+
-set(PangoCairo_PROCESS_LIBS PangoCairo_LIBRARY Pango_LIBRARY Cairo_LIBRARY)
83
+
+libfind_pkg_check_modules(PangoCairo_PKGCONF IMPORTED_TARGET pangocairo)
84
+
+set(PangoCairo_LIBRARY PkgConfig::PangoCairo_PKGCONF)
85
+
libfind_process(PangoCairo)
86
+
-