blob: 814d692694fde8bb3fb8bf597b423d72c46911ec (
plain)
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
|
--- ./cmake/modules/FindKipi.cmake.orig 2009-01-06 20:27:37.000000000 +0300
+++ ./cmake/modules/FindKipi.cmake 2009-09-23 00:39:53.000000000 +0400
@@ -48,52 +48,28 @@
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
- INCLUDE(UsePkgConfig)
-
- PKGCONFIG(libkipi _KIPIIncDir _KIPILinkDir _KIPILinkFlags _KIPICflags)
-
- if(_KIPILinkFlags)
- # query pkg-config asking for a libkipi >= 0.2.0
- exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkipi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
- if(_return_VALUE STREQUAL "0")
- message(STATUS "Found libkipi release >= 0.2.0")
- set(KIPI_VERSION_GOOD_FOUND TRUE)
- else(_return_VALUE STREQUAL "0")
- message(STATUS "Found libkipi release < 0.2.0, too old")
- set(KIPI_VERSION_GOOD_FOUND FALSE)
- set(KIPI_FOUND FALSE)
- endif(_return_VALUE STREQUAL "0")
- else(_KIPILinkFlags)
- set(KIPI_VERSION_GOOD_FOUND FALSE)
- set(KIPI_FOUND FALSE)
- endif(_KIPILinkFlags)
- else(NOT WIN32)
- set(KIPI_VERSION_GOOD_FOUND TRUE)
+ include(FindPkgConfig)
+ pkg_check_modules(PC_LIBKIPI libkexiv2-kde4>=0.2.0)
+ set(KIPI_DEFINITIONS ${PC_LIBKIPI_CFLAGS_OTHER})
endif(NOT WIN32)
- if(KIPI_VERSION_GOOD_FOUND)
- set(KIPI_DEFINITIONS ${_KIPICflags})
- find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KDE4_INCLUDE_DIR} ${_KIPIIncDir})
- find_library(KIPI_LIBRARIES NAMES kipi PATHS ${KDE4_LIB_DIR} ${_KIPILinkDir})
+ find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h
+ HINTS
+ ${PC_LIBKIPI_INCLUDEDIR}
+ ${PC_LIBKIPI_INCLUDE_DIRS}
+ )
+ find_library(KIPI_LIBRARY NAMES kipi
+ HINTS
+ ${PC_LIBKIPI_LIBDIR}
+ ${PC_LIBKIPI_LIBRARY_DIRS}
+ )
- if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
- set(KIPI_FOUND TRUE)
- endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
- endif(KIPI_VERSION_GOOD_FOUND)
- if (KIPI_FOUND)
- if (NOT Kipi_FIND_QUIETLY)
- message(STATUS "Found libkipi: ${KIPI_LIBRARIES}")
- endif (NOT Kipi_FIND_QUIETLY)
- else (KIPI_FOUND)
- if (Kipi_FIND_REQUIRED)
- if (NOT KIPI_INCLUDE_DIR)
- message(FATAL_ERROR "Could NOT find libkipi header files")
- endif (NOT KIPI_INCLUDE_DIR)
- if (NOT KIPI_LIBRARIES)
- message(FATAL_ERROR "Could NOT find libkipi library")
- endif (NOT KIPI_LIBRARIES)
- endif (Kipi_FIND_REQUIRED)
- endif (KIPI_FOUND)
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Kipi DEFAULT_MSG KIPI_LIBRARY KIPI_INCLUDE_DIR)
+
+ if(KIPI_FOUND)
+ set(KIPI_LIBRARIES ${KIPI_LIBRARY})
+ endif(KIPI_FOUND)
MARK_AS_ADVANCED(KIPI_INCLUDE_DIR KIPI_LIBRARIES)
|
