[kdelibs/KDE/4.10] cmake/modules: Ensure that the pkgconfig material is kept far away from the proper CMake logic.

[Ben Cooksley]

Git commit 0f09cc362819d7818f7ac95ab6a4b55912390011 by Ben Cooksley.
Committed on 06/01/2013 at 08:14.
Pushed by bcooksley into branch 'KDE/4.10'.

Ensure that the pkgconfig material is kept far away from the proper CMake logic.
This fixes build failures for all projects which use kipi on build.kde.org
CCMAIL: kde-buildsystem at kde.org
CCMAIL: caulier.gilles at gmail.com
CCMAIL: dodonvictor at gmail.com

M  +4    -4    cmake/modules/FindKipi.cmake

http://commits.kde.org/kdelibs/0f09cc362819d7818f7ac95ab6a4b55912390011

diff --git a/cmake/modules/FindKipi.cmake b/cmake/modules/FindKipi.cmake
index 5024450..d9bd8eb 100644
--- a/cmake/modules/FindKipi.cmake
+++ b/cmake/modules/FindKipi.cmake
@@ -78,13 +78,13 @@ ELSE(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS AND KIPI_VERSION A
       ENDIF(NOT Kipi_FIND_QUIETLY)
 
       INCLUDE(FindPkgConfig)
-      PKG_CHECK_MODULES(KIPI libkipi>=${Kipi_FIND_VERSION})
+      PKG_CHECK_MODULES(PC_KIPI libkipi>=${Kipi_FIND_VERSION})
     ENDIF(NOT WIN32)
 
-    FIND_LIBRARY(KIPI_LIBRARIES NAMES libkipi PATHS ${KIPI_LIBRARY_DIRS} ${LIB_INSTALL_DIR} ${KDE4_LIB_DIR})
-    FIND_PATH(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KIPI_INCLUDE_DIRS} ${INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR})
+    FIND_LIBRARY(KIPI_LIBRARIES NAMES kipi HINTS ${PC_KIPI_LIBRARY_DIRS} ${LIB_INSTALL_DIR} ${KDE4_LIB_DIR})
+    FIND_PATH(KIPI_INCLUDE_DIR NAMES libkipi/version.h HINTS ${PC_KIPI_INCLUDE_DIRS} ${INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR})
     SET(KIPI_VERSION_H_FILENAME "${KIPI_INCLUDE_DIR}/libkipi/version.h")
-    SET(KIPI_DEFINITIONS ${KIPI_CFLAGS} CACHE STRING "Kipi defintions")
+    SET(KIPI_DEFINITIONS ${PC_KIPI_CFLAGS} CACHE STRING "Kipi defintions")
 
     INCLUDE(FindPackageHandleStandardArgs)
     FIND_PACKAGE_HANDLE_STANDARD_ARGS(KIPI DEFAULT_MSG KIPI_LIBRARIES KIPI_INCLUDE_DIR)