Unreviewed, rolling out r198781.

https://bugs.webkit.org/show_bug.cgi?id=155986

broke windows clean build (Requested by alexchristensen on
#webkit).

Reverted changeset:

"[Win] CMake seems to build all generated files every time"
https://bugs.webkit.org/show_bug.cgi?id=155872
http://trac.webkit.org/changeset/198781

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@198795 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index b908165..dabdef3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2016-03-29  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r198781.
+        https://bugs.webkit.org/show_bug.cgi?id=155986
+
+        broke windows clean build (Requested by alexchristensen on
+        #webkit).
+
+        Reverted changeset:
+
+        "[Win] CMake seems to build all generated files every time"
+        https://bugs.webkit.org/show_bug.cgi?id=155872
+        http://trac.webkit.org/changeset/198781
+
 2016-03-29  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] CMake seems to build all generated files every time

diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
index 2c1d67b..94cc84f 100644 (file)
--- a/Source/cmake/WebKitMacros.cmake
+++ b/Source/cmake/WebKitMacros.cmake
@@ -91,12 +91,6 @@ macro(GENERATE_BINDINGS _output_source _input_files _base_dir _idl_includes _fea
             set(_no_mm 0)
         endif ()
 
-        if (MSVC)
-            set(_custom_outputs "${_destination}/${_prefix}${_name}.h")
-        else ()
-            set(_custom_outputs "${_destination}/${_prefix}${_name}.${_extension}" "${_destination}/${_prefix}${_name}.h")
-        endif ()
-
         if (${_no_mm})
             add_custom_command(
                 OUTPUT ${_destination}/${_prefix}${_name}.h
@@ -109,7 +103,7 @@ macro(GENERATE_BINDINGS _output_source _input_files _base_dir _idl_includes _fea
             list(APPEND ${_output_source} ${_destination}/${_prefix}${_name}.h)
         else ()
             add_custom_command(
-                OUTPUT ${_custom_outputs}
+                OUTPUT ${_destination}/${_prefix}${_name}.${_extension} ${_destination}/${_prefix}${_name}.h
                 MAIN_DEPENDENCY ${_file}
                 DEPENDS ${COMMON_GENERATOR_DEPENDENCIES}
                 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${BINDING_GENERATOR} --defines "${_features}" --generator ${_generator} ${_idl_includes} --outputDir "${_destination}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --idlAttributesFile ${_idl_attributes_file} ${_supplemental_dependency} ${_file}