Fixes for #95785 incorrect use of execute_process: compiler version variables wrong...
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 6 Jul 2012 14:13:38 +0000 (14:13 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 6 Jul 2012 14:13:38 +0000 (14:13 +0000)
cmake/CMakelinux.cmake
cmake/CMakelinuxalphagcc.cmake
cmake/CMakelinuxia64gcc.cmake
cmake/CMakelinuxx8664gcc.cmake

index 1c8e6b7..7ade367 100644 (file)
@@ -12,12 +12,14 @@ cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 
-  execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion | cut -d. -f1 
-                   OUTPUT_VARIABLE CCMAJORV
-                   OUTPUT_STRIP_TRAILING_WHITESPACE) 
-  execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion | cut -d. -f2
-                   OUTPUT_VARIABLE CCMINORV
-                   OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                 COMMAND cut -d. -f1
+                 OUTPUT_VARIABLE CCMAJORV
+                 OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                 COMMAND cut -d. -f2
+                 OUTPUT_VARIABLE CCMINORV
+                 OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 endif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 
index bc5c9ef..5a50350 100644 (file)
@@ -11,10 +11,12 @@ cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
 #Retrieve Compiler Version
 
 
-execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion | cut -d. -f1 
+execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                 COMMAND cut -d. -f1
                  OUTPUT_VARIABLE CCMAJORV
                  OUTPUT_STRIP_TRAILING_WHITESPACE) 
-execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion | cut -d. -f2
+execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                 COMMAND cut -d. -f2
                  OUTPUT_VARIABLE CCMINORV
                  OUTPUT_STRIP_TRAILING_WHITESPACE)
 
index 10c4535..725a50b 100644 (file)
@@ -11,10 +11,12 @@ cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
 #Retrieve Compiler Version
 
 
-execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion | cut -d. -f1 
+execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                 COMMAND cut -d. -f1
                  OUTPUT_VARIABLE CCMAJORV
                  OUTPUT_STRIP_TRAILING_WHITESPACE) 
-execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion | cut -d. -f2
+execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                 COMMAND cut -d. -f2
                  OUTPUT_VARIABLE CCMINORV
                  OUTPUT_STRIP_TRAILING_WHITESPACE)
 
index 700f001..74413fc 100644 (file)
@@ -13,10 +13,12 @@ cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
 #Retrieve Compiler Version
 
 
-execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion | cut -d. -f1 
+execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                 COMMAND cut -d. -f1
                  OUTPUT_VARIABLE CCMAJORV
                  OUTPUT_STRIP_TRAILING_WHITESPACE) 
-execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion | cut -d. -f2
+execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                 COMMAND cut -d. -f2
                  OUTPUT_VARIABLE CCMINORV
                  OUTPUT_STRIP_TRAILING_WHITESPACE)