Title: [202060] trunk/Tools
- Revision
- 202060
- Author
- [email protected]
- Date
- 2016-06-14 13:17:10 -0700 (Tue, 14 Jun 2016)
Log Message
Follow-up fix: REGRESSION (r202020): El Capitan CMake Debug build broken
<https://webkit.org/b/158743>
Unreviewed build fix.
The fix in r202056 clobbered DumpRenderTree_SOURCES and
TestNetscapePlugin_SOURCES from DumpRenderTree/CMakeLists.txt,
so the build failure is now that we're not building the common
sources.
Fix that by saving the common sources (which are all C++ source
files) into *_Cpp_SOURCES lists first, then setting the compiler
flags, then creating the final *_SOURCES lists.
* DumpRenderTree/PlatformMac.cmake: Add
${TestNetscapePlugin_Cpp_SOURCES} to list that needs
"-std=c++14" compiler switch.
(TestNetscapePlugin_Cpp_SOURCES): Add new list for C++ source
files for TestNetscapePlugin. Seeded with
${TestNetscapePlugin_SOURCES} from CMakeLists.txt.
(TestNetscapePlugin_SOURCES): Add
${TestNetscapePlugin_Cpp_SOURCES} to the list of files.
(DumpRenderTree_Cpp_SOURCES): Seed list for C++ source files
with ${DumpRenderTree_SOURCES} from CMakeLists.txt.
(DumpRenderTree_SOURCES): Reformat and sort source lists.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (202059 => 202060)
--- trunk/Tools/ChangeLog 2016-06-14 20:15:47 UTC (rev 202059)
+++ trunk/Tools/ChangeLog 2016-06-14 20:17:10 UTC (rev 202060)
@@ -1,5 +1,33 @@
2016-06-14 David Kilzer <[email protected]>
+ Follow-up fix: REGRESSION (r202020): El Capitan CMake Debug build broken
+ <https://webkit.org/b/158743>
+
+ Unreviewed build fix.
+
+ The fix in r202056 clobbered DumpRenderTree_SOURCES and
+ TestNetscapePlugin_SOURCES from DumpRenderTree/CMakeLists.txt,
+ so the build failure is now that we're not building the common
+ sources.
+
+ Fix that by saving the common sources (which are all C++ source
+ files) into *_Cpp_SOURCES lists first, then setting the compiler
+ flags, then creating the final *_SOURCES lists.
+
+ * DumpRenderTree/PlatformMac.cmake: Add
+ ${TestNetscapePlugin_Cpp_SOURCES} to list that needs
+ "-std=c++14" compiler switch.
+ (TestNetscapePlugin_Cpp_SOURCES): Add new list for C++ source
+ files for TestNetscapePlugin. Seeded with
+ ${TestNetscapePlugin_SOURCES} from CMakeLists.txt.
+ (TestNetscapePlugin_SOURCES): Add
+ ${TestNetscapePlugin_Cpp_SOURCES} to the list of files.
+ (DumpRenderTree_Cpp_SOURCES): Seed list for C++ source files
+ with ${DumpRenderTree_SOURCES} from CMakeLists.txt.
+ (DumpRenderTree_SOURCES): Reformat and sort source lists.
+
+2016-06-14 David Kilzer <[email protected]>
+
REGRESSION (r202020): El Capitan CMake Debug build broken
<https://webkit.org/b/158743>
Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (202059 => 202060)
--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-06-14 20:15:47 UTC (rev 202059)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-06-14 20:17:10 UTC (rev 202060)
@@ -47,12 +47,25 @@
${WTF_DIR}/icu
)
+# Common ${TestNetscapePlugin_SOURCES} from CMakeLists.txt are C++ source files.
+list(APPEND TestNetscapePlugin_Cpp_SOURCES
+ ${TestNetscapePlugin_SOURCES}
+)
+
list(APPEND TestNetscapePlugin_ObjCpp_SOURCES
TestNetscapePlugIn/PluginObjectMac.mm
)
-set(TestNetscapePlugin_SOURCES ${TestNetscapePlugin_ObjCpp_SOURCES})
+set(TestNetscapePlugin_SOURCES
+ ${TestNetscapePlugin_Cpp_SOURCES}
+ ${TestNetscapePlugin_ObjCpp_SOURCES}
+)
+# Common ${DumpRenderTree_SOURCES} from CMakeLists.txt are C++ source files.
+list(APPEND DumpRenderTree_Cpp_SOURCES
+ ${DumpRenderTree_SOURCES}
+)
+
list(APPEND DumpRenderTree_ObjC_SOURCES
DefaultPolicyDelegate.m
DumpRenderTreeFileDraggingSource.m
@@ -100,13 +113,17 @@
mac/WorkQueueItemMac.mm
)
-set(DumpRenderTree_SOURCES ${DumpRenderTree_ObjC_SOURCES} ${DumpRenderTree_ObjCpp_SOURCES} ${DumpRenderTree_Cpp_Sources})
+set(DumpRenderTree_SOURCES
+ ${DumpRenderTree_Cpp_Sources}
+ ${DumpRenderTree_ObjC_SOURCES}
+ ${DumpRenderTree_ObjCpp_SOURCES}
+)
foreach (_file ${DumpRenderTree_ObjC_SOURCES})
set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-std=c99")
endforeach ()
-foreach (_file ${DumpRenderTree_Cpp_SOURCES})
+foreach (_file ${DumpRenderTree_Cpp_SOURCES} ${TestNetscapePlugin_Cpp_SOURCES})
set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-std=c++14")
endforeach ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
