File fix_cmake_output.diff of Package qtcurve-kde4

Overview Repositories Revisions Requests Users Attributes Meta

File fix_cmake_output.diff of Package qtcurve-kde4

--- CMakeLists.txt.old	2013-07-08 16:13:22.877617270 +0200
+++ CMakeLists.txt	2013-07-08 16:16:44.010088693 +0200
@@ -1,5 +1,5 @@
 project(QtCurve-KDE4)
-cmake_minimum_required(VERSION 2.4.4)
+cmake_minimum_required(VERSION 2.8.0)
 
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
 set(CPACK_GENERATOR "DEB;RPM;TGZ")
@@ -27,9 +27,12 @@
 find_program(KDE3CONFIG_EXECUTABLE kde-config)
 
 if(KDE3CONFIG_EXECUTABLE)
-    exec_program(${KDE3CONFIG_EXECUTABLE}
-                    ARGS --prefix
-                    OUTPUT_VARIABLE KDE3PREFIX)
+    execute_process(
+      COMMAND ${KDE3CONFIG_EXECUTABLE}
+      ARGS --prefix
+      OUTPUT_VARIABLE KDE3PREFIX
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
 endif(KDE3CONFIG_EXECUTABLE)
 
 find_program(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
@@ -42,13 +45,19 @@
 # Then set install prefix...
 if (KDE4_KDECONFIG_EXECUTABLE)
     if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-        exec_program(${KDE4_KDECONFIG_EXECUTABLE}
-                     ARGS --prefix
-                     OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX)
+        execute_process(
+          COMMAND ${KDE4_KDECONFIG_EXECUTABLE}
+          ARGS --prefix
+          OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX
+          OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
     endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    exec_program(${KDE4_KDECONFIG_EXECUTABLE}
-                    ARGS --prefix
-                    OUTPUT_VARIABLE KDE4PREFIX)
+        execute_process(
+          COMMAND ${KDE4_KDECONFIG_EXECUTABLE}
+          ARGS --prefix
+          OUTPUT_VARIABLE KDE4PREFIX
+          OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
 endif (KDE4_KDECONFIG_EXECUTABLE)
 
 if(NOT KDE3PREFIX)

Places

File fix_cmake_output.diff of Package qtcurve-kde4

Places