Title: [198781] trunk
- Revision
- 198781
- Author
- [email protected]
- Date
- 2016-03-29 08:42:46 -0700 (Tue, 29 Mar 2016)
Log Message
[Win] CMake seems to build all generated files every time
https://bugs.webkit.org/show_bug.cgi?id=155872
Reviewed by Alex Christensen.
This seems to be caused by Visual Studio being unhappy receiving multiple output targets
for its custom build rules. If I limit the output to just the header file on Windows, the
dependency check seems to do the right thing.
* Source/cmake/WebKitMacros.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (198780 => 198781)
--- trunk/ChangeLog 2016-03-29 15:40:33 UTC (rev 198780)
+++ trunk/ChangeLog 2016-03-29 15:42:46 UTC (rev 198781)
@@ -1,3 +1,16 @@
+2016-03-29 Brent Fulgham <[email protected]>
+
+ [Win] CMake seems to build all generated files every time
+ https://bugs.webkit.org/show_bug.cgi?id=155872
+
+ Reviewed by Alex Christensen.
+
+ This seems to be caused by Visual Studio being unhappy receiving multiple output targets
+ for its custom build rules. If I limit the output to just the header file on Windows, the
+ dependency check seems to do the right thing.
+
+ * Source/cmake/WebKitMacros.cmake:
+
2016-03-28 Alex Christensen <[email protected]>
Fix Mac Ninja build after r198766.
Modified: trunk/Source/cmake/WebKitMacros.cmake (198780 => 198781)
--- trunk/Source/cmake/WebKitMacros.cmake 2016-03-29 15:40:33 UTC (rev 198780)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-03-29 15:42:46 UTC (rev 198781)
@@ -91,6 +91,12 @@
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
@@ -103,7 +109,7 @@
list(APPEND ${_output_source} ${_destination}/${_prefix}${_name}.h)
else ()
add_custom_command(
- OUTPUT ${_destination}/${_prefix}${_name}.${_extension} ${_destination}/${_prefix}${_name}.h
+ OUTPUT ${_custom_outputs}
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
