blob: ebe252b8fcb785ef37916797e56b80df6898a071 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
--- cmake/modules/FindKdcraw.cmake.orig 2011-05-20 22:24:53.000000000 +0200
+++ cmake/modules/FindKdcraw.cmake 2011-07-31 04:06:34.029187418 +0200
@@ -59,63 +59,32 @@
else(KDCRAW_LOCAL_FOUND)
- message(STATUS "Check Kdcraw library using pkg-config...")
if (NOT WIN32)
+ message(STATUS "Check Kdcraw library using pkg-config...")
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
- include(UsePkgConfig)
-
- PKGCONFIG(libkdcraw _KDCRAWIncDir _KDCRAWLinkDir _KDCRAWLinkFlags _KDCRAWCflags)
-
- if (_KDCRAWLinkFlags)
- # query pkg-config asking for a libkdcraw >= 0.2.0
- exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkdcraw RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
- if (_return_VALUE STREQUAL "0")
- message(STATUS "Found libkdcraw release >= 0.2.0")
- set(KDCRAW_VERSION_GOOD_FOUND TRUE)
- else (_return_VALUE STREQUAL "0")
- message(STATUS "Found libkdcaw release < 0.2.0, too old")
- set(KDCRAW_VERSION_GOOD_FOUND FALSE)
- set(KDCRAW_FOUND FALSE)
- endif (_return_VALUE STREQUAL "0")
- else (_KDCRAWLinkFlags)
- set(KDCRAW_VERSION_GOOD_FOUND FALSE)
- set(KDCRAW_FOUND FALSE)
- endif (_KDCRAWLinkFlags)
- else (NOT WIN32)
- set(KDCRAW_VERSION_GOOD_FOUND TRUE)
- endif (NOT WIN32)
+ include(FindPkgConfig)
+ pkg_check_modules(PC_LIBKDCRAW libkdcraw-kde4>=0.2.0)
+ set(KDCRAW_DEFINITIONS ${PC_LIBKDCRAW_CFLAGS_OTHER})
+ endif(NOT WIN32)
- if (KDCRAW_VERSION_GOOD_FOUND)
- set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}")
-
- find_path(KDCRAW_INCLUDE_DIR libkdcraw/version.h
- ${_KDCRAWIncDir}
+ find_path(KDCRAW_INCLUDE_DIR NAMES libkdcraw/version.h
+ HINTS
+ ${PC_LIBKDCRAW_INCLUDEDIR}
+ ${PC_LIBKDCRAW_INCLUDE_DIRS}
)
- find_library(KDCRAW_LIBRARIES NAMES kdcraw
- PATHS
- ${_KDCRAWLinkDir}
+ find_library(KDCRAW_LIBRARY NAMES kdcraw
+ HINTS
+ ${PC_LIBKDCRAW_LIBDIR}
+ ${PC_LIBKDCRAW_LIBRARY_DIRS}
)
- if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
- set(KDCRAW_FOUND TRUE)
- endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
- endif (KDCRAW_VERSION_GOOD_FOUND)
- if (KDCRAW_FOUND)
- if (NOT Kdcraw_FIND_QUIETLY)
- message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}")
- endif (NOT Kdcraw_FIND_QUIETLY)
- else (KDCRAW_FOUND)
- if (Kdcraw_FIND_REQUIRED)
- if (NOT KDCRAW_INCLUDE_DIR)
- message(FATAL_ERROR "Could NOT find libkdcraw header files")
- endif (NOT KDCRAW_INCLUDE_DIR)
- if (NOT KDCRAW_LIBRARIES)
- message(FATAL_ERROR "Could NOT find libkdcraw library")
- endif (NOT KDCRAW_LIBRARIES)
- endif (Kdcraw_FIND_REQUIRED)
- endif (KDCRAW_FOUND)
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Kdcraw DEFAULT_MSG KDCRAW_LIBRARY KDCRAW_INCLUDE_DIR)
+ if(KDCRAW_FOUND)
+ set(KDCRAW_LIBRARIES ${KDCRAW_LIBRARY})
+ endif(KDCRAW_FOUND)
mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS)
|
