Title: [198795] trunk
- Revision
- 198795
- Author
- [email protected]
- Date
- 2016-03-29 13:37:33 -0700 (Tue, 29 Mar 2016)
Log Message
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
Modified Paths
Diff
Modified: trunk/ChangeLog (198794 => 198795)
--- trunk/ChangeLog 2016-03-29 20:36:37 UTC (rev 198794)
+++ trunk/ChangeLog 2016-03-29 20:37:33 UTC (rev 198795)
@@ -1,3 +1,17 @@
+2016-03-29 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
[Win] CMake seems to build all generated files every time
Modified: trunk/Source/cmake/WebKitMacros.cmake (198794 => 198795)
--- trunk/Source/cmake/WebKitMacros.cmake 2016-03-29 20:36:37 UTC (rev 198794)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-03-29 20:37:33 UTC (rev 198795)
@@ -91,12 +91,6 @@
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 @@
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}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
