[packages/cantata] fix cmake warning

glen glen at pld-linux.org
Tue Jul 12 12:31:34 CEST 2016


commit ed6818047fd0943e94a7d59116ae5f3fc2132c62
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jul 12 13:19:42 2016 +0300

    fix cmake warning
    
    CMake Warning (dev) in CMakeLists.txt:
      A logical block opening on the line
    
        CMakeLists.txt:149 (if)
    
      closes on the line
    
        CMakeLists.txt:153 (endif)
    
      with mis-matching arguments.
    This warning is for project developers.  Use -Wno-dev to suppress it.

 libdir.patch | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/libdir.patch b/libdir.patch
index d94a8f2..99363fa 100644
--- a/libdir.patch
+++ b/libdir.patch
@@ -1,11 +1,17 @@
---- cantata-1.5.2/CMakeLists.txt~	2016-01-10 10:31:27.000000000 +0100
-+++ cantata-1.5.2/CMakeLists.txt	2016-01-11 07:35:12.310535875 +0100
-@@ -139,7 +139,7 @@
+--- cantata-1.5.2/CMakeLists.txt	2016-01-11 07:35:12.310535875 +0100
++++ cantata-2.0.1/CMakeLists.txt	2016-07-12 13:06:24.291313896 +0300
+@@ -146,11 +146,11 @@
  endif (NOT CMAKE_BUILD_TYPE)
  
  if (NOT APPLE AND NOT WIN32)
 -    if (CANTATA_HELPERS_LIB_DIR AND NOT ENABLE_KDE AND CMAKE_SIZEOF_VOID_P EQUAL 8)
 +    if (CANTATA_HELPERS_LIB_DIR)
          set(LINUX_LIB_DIR ${CANTATA_HELPERS_LIB_DIR})
-     else (CANTATA_HELPERS_LIB_DIR AND NOT ENABLE_KDE AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+-    else (CANTATA_HELPERS_LIB_DIR AND NOT ENABLE_KDE AND CMAKE_SIZEOF_VOID_P EQUAL 8)
++    else (CANTATA_HELPERS_LIB_DIR)
          set(LINUX_LIB_DIR lib)
+-    endif (CANTATA_HELPERS_LIB_DIR AND NOT ENABLE_KDE AND CMAKE_SIZEOF_VOID_P EQUAL 8)
++    endif (CANTATA_HELPERS_LIB_DIR)
+ endif (NOT APPLE AND NOT WIN32)
+ 
+ if (ENABLE_UBUNTU)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cantata.git/commitdiff/e80039909142acbe6ea7422dc1bee20641369540



More information about the pld-cvs-commit mailing list