diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-21 21:34:41 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-21 21:34:41 +0100 |
| commit | 715110a8a2e9e4b1a89635950744eb5260b8ee7f (patch) | |
| tree | 0d0e4c41631092a068d8b0823f4d6b0a8d725eed /gnu/packages/patches/gzdoom-find-system-libgme.patch | |
| parent | b3c2ebda5bcedcfb88475e53b7f36c3a42cac8b4 (diff) | |
| parent | 79e074ea10875ff75ca613179c70de12d64b19f5 (diff) | |
| download | guix-715110a8a2e9e4b1a89635950744eb5260b8ee7f.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/gzdoom-find-system-libgme.patch')
| -rw-r--r-- | gnu/packages/patches/gzdoom-find-system-libgme.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/gnu/packages/patches/gzdoom-find-system-libgme.patch b/gnu/packages/patches/gzdoom-find-system-libgme.patch new file mode 100644 index 0000000000..a7f277d614 --- /dev/null +++ b/gnu/packages/patches/gzdoom-find-system-libgme.patch @@ -0,0 +1,21 @@ +--- /CMakeLists.txt 2020-01-20 21:47:35.460119141 +0100 ++++ /CMakeLists.txt 2020-01-20 21:47:47.690112400 +0100 +@@ -195,12 +195,12 @@ + #endif() + + # GME +-#find_path( GME_INCLUDE_DIR gme/gme.h ) +-#find_library( GME_LIBRARIES gme ) +-#mark_as_advanced( GME_INCLUDE_DIR GME_LIBRARIES ) +-#FIND_PACKAGE_HANDLE_STANDARD_ARGS( GME +-# REQUIRED_VARS GME_LIBRARIES GME_INCLUDE_DIR +-#) ++find_path( GME_INCLUDE_DIR gme/gme.h ) ++find_library( GME_LIBRARIES gme ) ++mark_as_advanced( GME_INCLUDE_DIR GME_LIBRARIES ) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS( GME ++ REQUIRED_VARS GME_LIBRARIES GME_INCLUDE_DIR ++) + + if( MSVC ) + # Eliminate unreferenced functions and data |