| 1 |
keytoaster 08/10/02 11:58:22 |
| 2 |
|
| 3 |
Added: kdelibs-4.1.1-cmake-modules.patch |
| 4 |
Log: |
| 5 |
Added patch from the kde-testing overlay. |
| 6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 kde-base/kdelibs/files/kdelibs-4.1.1-cmake-modules.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.1.1-cmake-modules.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.1.1-cmake-modules.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: kdelibs-4.1.1-cmake-modules.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naur a/cmake/modules/FindKdcraw.cmake b/cmake/modules/FindKdcraw.cmake |
| 17 |
--- a/cmake/modules/FindKdcraw.cmake 2008-05-21 13:06:10.000000000 +0200 |
| 18 |
+++ b/cmake/modules/FindKdcraw.cmake 2008-09-22 16:33:42.000000000 +0200 |
| 19 |
@@ -69,14 +69,22 @@ |
| 20 |
if(KDCRAW_VERSION_GOOD_FOUND) |
| 21 |
set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}") |
| 22 |
|
| 23 |
+ # first try pkgconfig dir, fallback to cmake defaults |
| 24 |
FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h |
| 25 |
+ PATHS |
| 26 |
${_KDCRAWIncDir} |
| 27 |
+ ${KDE4_INCLUDE_DIR} |
| 28 |
+ NO_DEFAULT_PATH |
| 29 |
) |
| 30 |
+ FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h) |
| 31 |
|
| 32 |
FIND_LIBRARY(KDCRAW_LIBRARIES NAMES kdcraw |
| 33 |
PATHS |
| 34 |
${_KDCRAWLinkDir} |
| 35 |
+ ${KDE4_LIB_DIR} |
| 36 |
+ NO_DEFAULT_PATH |
| 37 |
) |
| 38 |
+ FIND_LIBRARY(KDCRAW_LIBRARIES NAMES kdcraw) |
| 39 |
|
| 40 |
if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) |
| 41 |
set(KDCRAW_FOUND TRUE) |
| 42 |
diff -Naur a/cmake/modules/FindKexiv2.cmake b/cmake/modules/FindKexiv2.cmake |
| 43 |
--- a/cmake/modules/FindKexiv2.cmake 2008-05-21 13:06:10.000000000 +0200 |
| 44 |
+++ b/cmake/modules/FindKexiv2.cmake 2008-09-22 16:32:47.000000000 +0200 |
| 45 |
@@ -68,14 +68,22 @@ |
| 46 |
if(KEXIV2_VERSION_GOOD_FOUND) |
| 47 |
set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}") |
| 48 |
|
| 49 |
+ # first try specific paths, use cmake defaults as fallback |
| 50 |
FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h |
| 51 |
+ PATHS |
| 52 |
${_KEXIV2IncDir} |
| 53 |
+ ${KDE4_INCLUDE_DIR} |
| 54 |
+ NO_DEFAULT_PATH |
| 55 |
) |
| 56 |
+ FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h) |
| 57 |
|
| 58 |
FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2 |
| 59 |
PATHS |
| 60 |
${_KEXIV2LinkDir} |
| 61 |
+ ${KDE4_LIB_DIR} |
| 62 |
+ NO_DEFAULT_PATH |
| 63 |
) |
| 64 |
+ FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2) |
| 65 |
|
| 66 |
if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) |
| 67 |
set(KEXIV2_FOUND TRUE) |
| 68 |
diff -Naur a/cmake/modules/FindKipi.cmake b/cmake/modules/FindKipi.cmake |
| 69 |
--- a/cmake/modules/FindKipi.cmake 2008-05-21 13:06:10.000000000 +0200 |
| 70 |
+++ b/cmake/modules/FindKipi.cmake 2008-09-22 16:21:37.000000000 +0200 |
| 71 |
@@ -68,8 +68,11 @@ |
| 72 |
if(KIPI_VERSION_GOOD_FOUND) |
| 73 |
set(KIPI_DEFINITIONS ${_KIPICflags}) |
| 74 |
|
| 75 |
- find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KDE4_INCLUDE_DIR} ${_KIPIIncDir}) |
| 76 |
- find_library(KIPI_LIBRARIES NAMES kipi PATHS ${KDE4_LIB_DIR} ${_KIPILinkDir}) |
| 77 |
+ # as suggested by cmake documentation, first try specific path, then default to searching everything else |
| 78 |
+ find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${_KIPIIncDir} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH) |
| 79 |
+ find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h) |
| 80 |
+ find_library(KIPI_LIBRARIES NAMES kipi PATHS ${_KIPILinkDir} ${KDE4_LIB_DIR} NO_DEFAULT_PATH) |
| 81 |
+ find_library(KIPI_LIBRARIES NAMES kipi) |
| 82 |
|
| 83 |
if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES) |
| 84 |
set(KIPI_FOUND TRUE) |
Archives