[SCM] libzen/master: Patch CMakeLists to use GNUInstallDirs

hyperair at users.alioth.debian.org hyperair at users.alioth.debian.org
Sun Apr 19 17:51:24 UTC 2015


The following commit has been merged in the master branch:
commit 1b2b7e9a9b2e0f1ef576821d44cfbd9ca8bd1fe4
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Thu Apr 16 10:58:48 2015 +0800

    Patch CMakeLists to use GNUInstallDirs
    
    This gives us automatic multiarch support.

diff --git a/debian/patches/Use-GNUInstallDirs-to-derive-installation-directorie.patch b/debian/patches/Use-GNUInstallDirs-to-derive-installation-directorie.patch
new file mode 100644
index 0000000..4f01910
--- /dev/null
+++ b/debian/patches/Use-GNUInstallDirs-to-derive-installation-directorie.patch
@@ -0,0 +1,28 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Date: Thu, 16 Apr 2015 10:58:04 +0800
+Subject: Use GNUInstallDirs to derive installation directories
+
+---
+ Project/CMake/CMakeLists.txt | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt
+index dad9f37..dc075b2 100755
+--- a/Project/CMake/CMakeLists.txt
++++ b/Project/CMake/CMakeLists.txt
+@@ -25,10 +25,12 @@ elseif(APPLE)
+   set(CMAKE_DEBUG_POSTFIX "_debug")
+ endif()
+ 
++include(GNUInstallDirs)
++
+ set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+-set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE STRING "Directory where binary will install")
+-set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Directory where library will install")
+-set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in")
++set(BIN_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE STRING "Directory where binary will install")
++set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE STRING "Directory where library will install")
++set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}" CACHE PATH "The directory the headers are installed in")
+ 
+ if(NOT MSVC)
+   set(ZenLib_CONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/zenlib")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8487c08
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Use-GNUInstallDirs-to-derive-installation-directorie.patch

-- 
libzen packaging



More information about the pkg-multimedia-commits mailing list