merge in the whitespace handling fixes from cmake 2.4.7

to make extragear-graphics work

svn path=/trunk/KDE/kdelibs/; revision=743254

4 files changed, 56 insertions, 26 deletions

diff --git a/modules/FindKdcraw.cmake b/modules/FindKdcraw.cmake
index 9c611384..f3b33bf8 100644
--- a/modules/FindKdcraw.cmake
+++ b/modules/FindKdcraw.cmake
@@ -31,7 +31,7 @@ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
     else (KDCRAW_LOCAL_FOUND_IN_LIBS)
       set(KDCRAW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkdcraw)
     endif (KDCRAW_LOCAL_FOUND_IN_LIBS)
-    set(KDCRAW_DEFINITIONS -I${KDCRAW_INCLUDE_DIR})
+    set(KDCRAW_DEFINITIONS "-I${KDCRAW_INCLUDE_DIR}")
     set(KDCRAW_LIBRARIES kdcraw)
     message(STATUS "Found Kdcraw library in local sub-folder: ${KDCRAW_INCLUDE_DIR}")
     set(KDCRAW_FOUND TRUE)
@@ -67,7 +67,7 @@ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
     ENDif(NOT WIN32)
 
     if(KDCRAW_VERSION_GOOD_FOUND)
-        set(KDCRAW_DEFINITIONS ${_KDCRAWCflags})
+        set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}")
     
         FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h
         ${_KDCRAWIncDir}
diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake
index da19ff8e..c57ed1c2 100644
--- a/modules/FindKexiv2.cmake
+++ b/modules/FindKexiv2.cmake
@@ -30,7 +30,7 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
     else (KEXIV2_LOCAL_FOUND_IN_LIBS)
       set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkexiv2)
     endif (KEXIV2_LOCAL_FOUND_IN_LIBS)
-    set(KEXIV2_DEFINITIONS -I${KEXIV2_INCLUDE_DIR})
+    set(KEXIV2_DEFINITIONS "-I${KEXIV2_INCLUDE_DIR}")
     set(KEXIV2_LIBRARIES kexiv2)
     message(STATUS "Found Kexiv2 library in local sub-folder: ${KEXIV2_INCLUDE_DIR}")
     set(KEXIV2_FOUND TRUE)
@@ -66,7 +66,7 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
     endif(NOT WIN32)
 
     if(KEXIV2_VERSION_GOOD_FOUND)
-        set(KEXIV2_DEFINITIONS ${_KEXIV2Cflags})
+        set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}")
     
         FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h
         ${_KEXIV2IncDir}
diff --git a/modules/PkgConfigVersion.cmake b/modules/PkgConfigVersion.cmake
new file mode 100644
index 00000000..88d90e55
--- /dev/null
+++ b/modules/PkgConfigVersion.cmake
@@ -0,0 +1,34 @@
+# - pkg-config module for CMake
+
+# Copyright (c) 2007 Will Stephenson <wstephenson@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+#
+# Defines the following macros:
+#
+# PKGCONFIG_VERSION(package includedir libdir linkflags cflags)
+#
+# ### ADD DOCUMENTATION!
+#
+
+include(UsePkgConfig)
+
+MACRO(PKGCONFIG_VERSION _package _include_DIR _link_DIR _link_FLAGS _cflags _found_version)
+   #reset variable
+   SET(${_found_version})
+   IF(PKGCONFIG_EXECUTABLE)
+      #call PKGCONFIG
+      PKGCONFIG(${_package} ${_include_DIR} ${_link_DIR} ${_link_FLAGS} ${_cflags})
+      IF(${_include_DIR})
+         EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --modversion OUTPUT_VARIABLE ${_found_version})
+         IF(NOT ${_found_version})
+            MESSAGE(FATAL_ERROR "UsePkgConfig.cmake: No version found for ${_package}")
+         ENDIF(NOT ${_found_version})
+      ENDIF(${_include_DIR})
+   ENDIF(PKGCONFIG_EXECUTABLE)
+ENDMACRO(PKGCONFIG_VERSION _package _include_DIR _link_DIR _link_FLAGS _cflags _found_version)
+
+MARK_AS_ADVANCED(PKGCONFIG_EXECUTABLE)
diff --git a/modules/UsePkgConfig.cmake b/modules/UsePkgConfig.cmake
index c8c6cd2a..8d6e0d34 100644
--- a/modules/UsePkgConfig.cmake
+++ b/modules/UsePkgConfig.cmake
@@ -1,3 +1,6 @@
+
+# THIS IS A SLIGHTLY ENHANCED COPY OVER THE ONE OF CMAKE 2.4.7. DO NOT MODIFY IT FURTHER
+
 # - pkg-config module for CMake
 #
 # Defines the following macros:
@@ -10,9 +13,7 @@
 # variable will be empty when the function returns, otherwise they will contain the respective information
 #
 
-
-
-FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config )
+FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/local/bin )
 
 MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
 # reset the variables at the beginning
@@ -20,6 +21,7 @@ MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
   SET(${_link_DIR})
   SET(${_link_FLAGS})
   SET(${_cflags})
+
   # if pkg-config has been found
   IF(PKGCONFIG_EXECUTABLE)
 
@@ -28,13 +30,22 @@ MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
     # and if the package of interest also exists for pkg-config, then get the information
     IF(NOT _return_VALUE)
 
-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir OUTPUT_VARIABLE ${_include_DIR} )
+      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir 
+        OUTPUT_VARIABLE ${_include_DIR} )
+      string(REGEX REPLACE "[\r\n]" " " ${_include_DIR} "${${_include_DIR}}")
+    
 
-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir OUTPUT_VARIABLE ${_link_DIR} )
+      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir 
+        OUTPUT_VARIABLE ${_link_DIR} )
+      string(REGEX REPLACE "[\r\n]" " " ${_link_DIR} "${${_link_DIR}}")
 
-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs OUTPUT_VARIABLE ${_link_FLAGS} )
+      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs 
+        OUTPUT_VARIABLE ${_link_FLAGS} )
+      string(REGEX REPLACE "[\r\n]" " " ${_link_FLAGS} "${${_link_FLAGS}}")
 
-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags OUTPUT_VARIABLE ${_cflags} )
+      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags 
+        OUTPUT_VARIABLE ${_cflags} )
+      string(REGEX REPLACE "[\r\n]" " " ${_cflags} "${${_cflags}}")
 
     ELSE( NOT _return_VALUE)
 
@@ -47,19 +58,4 @@ MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
 
 ENDMACRO(PKGCONFIG _include_DIR _link_DIR _link_FLAGS _cflags)
 
-MACRO(PKGCONFIG_VERSION _package _include_DIR _link_DIR _link_FLAGS _cflags _found_version)
-   #reset variable
-   SET(${_found_version})
-   IF(PKGCONFIG_EXECUTABLE)
-      #call PKGCONFIG
-      PKGCONFIG(${_package} ${_include_DIR} ${_link_DIR} ${_link_FLAGS} ${_cflags})
-      IF(${_include_DIR})
-         EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --modversion OUTPUT_VARIABLE ${_found_version})
-         IF(NOT ${_found_version})
-            MESSAGE(FATAL_ERROR "UsePkgConfig.cmake: No version found for ${_package}")
-         ENDIF(NOT ${_found_version})
-      ENDIF(${_include_DIR})
-   ENDIF(PKGCONFIG_EXECUTABLE)
-ENDMACRO(PKGCONFIG_VERSION _package _include_DIR _link_DIR _link_FLAGS _cflags _found_version)
-
 MARK_AS_ADVANCED(PKGCONFIG_EXECUTABLE)