[SCM] libdrumstick/master: Reset CMakeLists.txt to upstream version.

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Thu Sep 9 12:11:50 UTC 2010


The following commit has been merged in the master branch:
commit 1e8e97ee0ae417ec6f9fc34aacbea39c8bf33f53
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Thu Sep 9 13:56:41 2010 +0200

    Reset CMakeLists.txt to upstream version.
    
    Looks like debian/patches/no-lib-suffix.patch accidently got merged into
    the master branch.
    
    I hereby revert this change and let quilt patch the source.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac7595b..f9b9739 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,11 @@ IF(COMMAND CMAKE_POLICY)
     CMAKE_POLICY(SET CMP0003 NEW)
 ENDIF(COMMAND CMAKE_POLICY)
 
-# Debian, unlike the FHS, does not use a '64' suffix like 'lib64'
-SET(_INIT_LIB_SUFFIX "")
+IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+    SET(_INIT_LIB_SUFFIX "64")
+ELSE(CMAKE_SIZEOF_VOID_P MATCHES "8")
+    SET(_INIT_LIB_SUFFIX "")
+ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
 SET(LIB_SUFFIX ${_INIT_LIB_SUFFIX} CACHE STRING "optional library install directory suffix: 32, 64, none")
 
 #Comment out if relative paths break the link scripts

-- 
libdrumstick packaging



More information about the pkg-multimedia-commits mailing list