[libkdcraw] fix patch (caused CMake error)

Kevin Kofler kkofler at fedoraproject.org
Wed Feb 6 16:47:50 UTC 2013


commit e3aa2b3788743d5759fa64702b51d253ac084714
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Wed Feb 6 17:47:34 2013 +0100

    fix patch (caused CMake error)
    
    Use LIST APPEND instead of an incorrect SET which created one list entry
    instead of a list, with leading spaces, triggering the CMP0004 error.

 libkdcraw-4.10.0-libjpeg-turbo.patch |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/libkdcraw-4.10.0-libjpeg-turbo.patch b/libkdcraw-4.10.0-libjpeg-turbo.patch
index 4b66e14..c3f73f2 100644
--- a/libkdcraw-4.10.0-libjpeg-turbo.patch
+++ b/libkdcraw-4.10.0-libjpeg-turbo.patch
@@ -1,5 +1,5 @@
-From c0cd7aef053a288dc6bd1fb8a9b5a5e11ebd2982 Mon Sep 17 00:00:00 2001
-Message-Id: <c0cd7aef053a288dc6bd1fb8a9b5a5e11ebd2982.1360167127.git.kevin.kofler at chello.at>
+From 52109515b6647e7e658b3914dfd041d44f204734 Mon Sep 17 00:00:00 2001
+Message-Id: <52109515b6647e7e658b3914dfd041d44f204734.1360168959.git.kevin.kofler at chello.at>
 From: Kevin Kofler <kevin.kofler at chello.at>
 Date: Wed, 6 Feb 2013 17:11:58 +0100
 Subject: [PATCH] fix libjpeg detection for libjpeg-turbo
@@ -19,7 +19,7 @@ error.
  3 Dateien geändert, 29 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-)
 
 diff --git a/libraw/CMakeLists.txt b/libraw/CMakeLists.txt
-index 581e7b1..6f92fe7 100644
+index 581e7b1..598aa31 100644
 --- a/libraw/CMakeLists.txt
 +++ b/libraw/CMakeLists.txt
 @@ -88,28 +88,29 @@ ENDIF (ENABLE_LCMS2)
@@ -43,9 +43,9 @@ index 581e7b1..6f92fe7 100644
 +
 +    # check for the jpeg_mem_src function
 +    SET(OLD_CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES}")
-+    SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES} ${JPEG_INCLUDE_DIR}")
++    LIST(APPEND CMAKE_REQUIRED_INCLUDES "${JPEG_INCLUDE_DIR}")
 +    SET(OLD_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
-+    SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES} ${JPEG_LIBRARY}")
++    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "${JPEG_LIBRARY}")
 +    CHECK_SYMBOL_EXISTS(jpeg_mem_src jpeglib.h HAVE_JPEG_MEM_SRC)
 +    SET(CMAKE_REQUIRED_INCLUDES "${OLD_CMAKE_REQUIRED_INCLUDES}")
 +    SET(CMAKE_REQUIRED_LIBRARIES "${OLD_CMAKE_REQUIRED_LIBRARIES}")


More information about the scm-commits mailing list