36047b1641
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=4315a0e5d0e90573fc5f672d4c4dadc8
83 lines
3.0 KiB
Diff
83 lines
3.0 KiB
Diff
Index: digikam-4.1.0/core/CMakeLists.txt
|
|
===================================================================
|
|
--- digikam-4.1.0.orig/core/CMakeLists.txt
|
|
+++ digikam-4.1.0/core/CMakeLists.txt
|
|
@@ -203,21 +203,23 @@ ENDIF (NOT OpenCV_INCLUDE_DIRS)
|
|
|
|
# check the libkdcraw version
|
|
|
|
+# Check is done by FindKdcraw.cmake in another way - this way does not seem valid any more
|
|
+# TODO: find a proper fix
|
|
SET(KDCRAW_MIN_VERSION "2.2.0")
|
|
|
|
-IF (KDCRAW_VERSION)
|
|
-
|
|
- MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})")
|
|
- IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
- SET(KDCRAW_FOUND FALSE)
|
|
- ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
-
|
|
-ELSE (KDCRAW_VERSION)
|
|
-
|
|
- MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.")
|
|
- SET(KDCRAW_FOUND FALSE)
|
|
-
|
|
-ENDIF (KDCRAW_VERSION)
|
|
+# IF (KDCRAW_VERSION)
|
|
+#
|
|
+# MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})")
|
|
+# IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
+# SET(KDCRAW_FOUND FALSE)
|
|
+# ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
+#
|
|
+# ELSE (KDCRAW_VERSION)
|
|
+#
|
|
+# MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.")
|
|
+# SET(KDCRAW_FOUND FALSE)
|
|
+#
|
|
+# ENDIF (KDCRAW_VERSION)
|
|
|
|
# LCMS version 1 and 2 library handling
|
|
# See B.K.O #294105
|
|
Index: digikam-4.1.0/extra/kipi-plugins/CMakeLists.txt
|
|
===================================================================
|
|
--- digikam-4.1.0.orig/extra/kipi-plugins/CMakeLists.txt
|
|
+++ digikam-4.1.0/extra/kipi-plugins/CMakeLists.txt
|
|
@@ -139,21 +139,23 @@ FIND_PACKAGE(Kdcraw RE
|
|
|
|
# Check the libkdcraw version
|
|
|
|
+# Check is done by FindKdcraw.cmake in another way - this way does not seem valid any more
|
|
+# TODO: find a proper fix
|
|
SET(KDCRAW_MIN_VERSION "2.2.0")
|
|
|
|
-IF (KDCRAW_VERSION)
|
|
-
|
|
- MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})")
|
|
- IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
- SET(KDCRAW_FOUND FALSE)
|
|
- ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
-
|
|
-ELSE (KDCRAW_VERSION)
|
|
-
|
|
- MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.")
|
|
- SET(KDCRAW_FOUND FALSE)
|
|
-
|
|
-ENDIF (KDCRAW_VERSION)
|
|
+# IF (KDCRAW_VERSION)
|
|
+#
|
|
+# MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})")
|
|
+# IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
+# SET(KDCRAW_FOUND FALSE)
|
|
+# ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
+#
|
|
+# ELSE (KDCRAW_VERSION)
|
|
+#
|
|
+# MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.")
|
|
+# SET(KDCRAW_FOUND FALSE)
|
|
+#
|
|
+# ENDIF (KDCRAW_VERSION)
|
|
|
|
# Optional dependencies detection required by some plugins
|
|
MACRO_OPTIONAL_FIND_PACKAGE(EXPAT) # For DNGConverter: XMP SDK need Expat library to compile.
|