Title: [179121] trunk
Revision
179121
Author
o...@webkit.org
Date
2015-01-26 10:03:57 -0800 (Mon, 26 Jan 2015)

Log Message

[cmake] Remove compiler version calculate cruft
https://bugs.webkit.org/show_bug.cgi?id=140885

Reviewed by Darin Adler.

* Source/cmake/WebKitHelpers.cmake:

Modified Paths

Diff

Modified: trunk/ChangeLog (179120 => 179121)


--- trunk/ChangeLog	2015-01-26 18:02:16 UTC (rev 179120)
+++ trunk/ChangeLog	2015-01-26 18:03:57 UTC (rev 179121)
@@ -1,5 +1,14 @@
 2015-01-26  Csaba Osztrogonác  <o...@webkit.org>
 
+        [cmake] Remove compiler version calculate cruft
+        https://bugs.webkit.org/show_bug.cgi?id=140885
+
+        Reviewed by Darin Adler.
+
+        * Source/cmake/WebKitHelpers.cmake:
+
+2015-01-26  Csaba Osztrogonác  <o...@webkit.org>
+
         [cmake] Stop compiling with -Wno-error=uninitialized and -Wno-error=literal-suffix
         https://bugs.webkit.org/show_bug.cgi?id=140886
 

Modified: trunk/Source/cmake/WebKitHelpers.cmake (179120 => 179121)


--- trunk/Source/cmake/WebKitHelpers.cmake	2015-01-26 18:02:16 UTC (rev 179120)
+++ trunk/Source/cmake/WebKitHelpers.cmake	2015-01-26 18:03:57 UTC (rev 179121)
@@ -10,14 +10,6 @@
             set(OLD_COMPILE_FLAGS "")
         endif ()
 
-        include(TestCXXAcceptsFlag)
-        CHECK_CXX_ACCEPTS_FLAG("-dumpversion" CMAKE_CXX_ACCEPTS_DUMPVERSION)
-        if (CMAKE_CXX_ACCEPTS_DUMPVERSION)
-            EXEC_PROGRAM(${CMAKE_CXX_COMPILER} ARGS -dumpversion OUTPUT_VARIABLE COMPILER_VERSION)
-        else ()
-            EXEC_PROGRAM("${CMAKE_CXX_COMPILER} -E -Wp,-dM - < /dev/null | grep '#define __VERSION__' | grep -E -o '[0-9]+\\.[0-9]+\\.?[0-9]+?'" OUTPUT_VARIABLE COMPILER_VERSION)
-        endif ()
-
         get_target_property(TARGET_TYPE ${_target} TYPE)
         if (${TARGET_TYPE} STREQUAL "STATIC_LIBRARY") # -fPIC is automatically added to shared libraries
             set(OLD_COMPILE_FLAGS "-fPIC ${OLD_COMPILE_FLAGS}")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to