Title: [198772] trunk
- Revision
- 198772
- Author
- achristen...@apple.com
- Date
- 2016-03-28 18:27:51 -0700 (Mon, 28 Mar 2016)
Log Message
Fix Windows build after r198766.
* Source/cmake/WebKitMacros.cmake:
Use the filename from the cpp so that WebCorePrefix.cpp and WebCoreDerivedSourcesPrefix.cpp
generate unique .pch files, even though they both include WebCorePrefix.h
Modified Paths
Diff
Modified: trunk/ChangeLog (198771 => 198772)
--- trunk/ChangeLog 2016-03-29 01:06:56 UTC (rev 198771)
+++ trunk/ChangeLog 2016-03-29 01:27:51 UTC (rev 198772)
@@ -1,5 +1,13 @@
2016-03-28 Alex Christensen <achristen...@webkit.org>
+ Fix Windows build after r198766.
+
+ * Source/cmake/WebKitMacros.cmake:
+ Use the filename from the cpp so that WebCorePrefix.cpp and WebCoreDerivedSourcesPrefix.cpp
+ generate unique .pch files, even though they both include WebCorePrefix.h
+
+2016-03-28 Alex Christensen <achristen...@webkit.org>
+
Fix Ninja build on Mac
https://bugs.webkit.org/show_bug.cgi?id=151399
Modified: trunk/Source/cmake/WebKitMacros.cmake (198771 => 198772)
--- trunk/Source/cmake/WebKitMacros.cmake 2016-03-29 01:06:56 UTC (rev 198771)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-03-29 01:27:51 UTC (rev 198772)
@@ -25,7 +25,7 @@
macro(ADD_PRECOMPILED_HEADER _header _cpp _source)
if (MSVC)
- get_filename_component(PrecompiledBasename ${_header} NAME_WE)
+ get_filename_component(PrecompiledBasename ${_cpp} NAME_WE)
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${_source}")
set(PrecompiledBinary "${CMAKE_CURRENT_BINARY_DIR}/${_source}/${PrecompiledBasename}.pch")
set(_sources ${${_source}})
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
