<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[208429] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/208429">208429</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-09 08:52:09 -0800 (Wed, 09 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix Tools build on case sensitive file systems
https://bugs.webkit.org/show_bug.cgi?id=164474
Unreviewed buildfix.
* DumpRenderTree/CMakeLists.txt:
* DumpRenderTree/PlatformMac.cmake:
* DumpRenderTree/PlatformWin.cmake:
* DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
* MiniBrowser/mac/CMakeLists.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeCMakeListstxt">trunk/Tools/DumpRenderTree/CMakeLists.txt</a></li>
<li><a href="#trunkToolsDumpRenderTreePlatformMaccmake">trunk/Tools/DumpRenderTree/PlatformMac.cmake</a></li>
<li><a href="#trunkToolsDumpRenderTreePlatformWincmake">trunk/Tools/DumpRenderTree/PlatformWin.cmake</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestNetscapePlugInCMakeListstxt">trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt</a></li>
<li><a href="#trunkToolsMiniBrowsermacCMakeListstxt">trunk/Tools/MiniBrowser/mac/CMakeLists.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (208428 => 208429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-11-09 16:49:19 UTC (rev 208428)
+++ trunk/Tools/ChangeLog 2016-11-09 16:52:09 UTC (rev 208429)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-09 Csaba Osztrogonác <ossy@webkit.org>
+
+ Fix Tools build on case sensitive file systems
+ https://bugs.webkit.org/show_bug.cgi?id=164474
+
+ Unreviewed buildfix.
+
+ * DumpRenderTree/CMakeLists.txt:
+ * DumpRenderTree/PlatformMac.cmake:
+ * DumpRenderTree/PlatformWin.cmake:
+ * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
+ * MiniBrowser/mac/CMakeLists.txt:
+
</ins><span class="cx"> 2016-11-04 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> WTF::ParkingLot should stop using std::chrono because std::chrono::duration casts are prone to overflows
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (208428 => 208429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-11-09 16:49:19 UTC (rev 208428)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-11-09 16:52:09 UTC (rev 208429)
</span><span class="lines">@@ -81,36 +81,36 @@
</span><span class="cx"> ${WEBCORE_DIR}/testing/js
</span><span class="cx"> )
</span><span class="cx">
</span><del>-set(TestNetscapePlugin_SOURCES
- TestNetscapePlugin/PluginObject.cpp
- TestNetscapePlugin/PluginTest.cpp
- TestNetscapePlugin/TestObject.cpp
- TestNetscapePlugin/main.cpp
</del><ins>+set(TestNetscapePlugIn_SOURCES
+ TestNetscapePlugIn/PluginObject.cpp
+ TestNetscapePlugIn/PluginTest.cpp
+ TestNetscapePlugIn/TestObject.cpp
+ TestNetscapePlugIn/main.cpp
</ins><span class="cx">
</span><del>- TestNetscapePlugin/Tests/DocumentOpenInDestroyStream.cpp
- TestNetscapePlugin/Tests/EvaluateJSAfterRemovingPluginElement.cpp
- TestNetscapePlugin/Tests/FormValue.cpp
- TestNetscapePlugin/Tests/GetURLNotifyWithURLThatFailsToLoad.cpp
- TestNetscapePlugin/Tests/GetURLWithJavaScriptURL.cpp
- TestNetscapePlugin/Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp
- TestNetscapePlugin/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp
- TestNetscapePlugin/Tests/LogNPPSetWindow.cpp
- TestNetscapePlugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
- TestNetscapePlugin/Tests/NPPNewFails.cpp
- TestNetscapePlugin/Tests/NPPSetWindowCalledDuringDestruction.cpp
- TestNetscapePlugin/Tests/NPRuntimeCallsWithNullNPP.cpp
- TestNetscapePlugin/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp
- TestNetscapePlugin/Tests/NPRuntimeRemoveProperty.cpp
- TestNetscapePlugin/Tests/NullNPPGetValuePointer.cpp
- TestNetscapePlugin/Tests/PassDifferentNPPStruct.cpp
- TestNetscapePlugin/Tests/PluginScriptableNPObjectInvokeDefault.cpp
- TestNetscapePlugin/Tests/PluginScriptableObjectOverridesAllProperties.cpp
- TestNetscapePlugin/Tests/PrivateBrowsing.cpp
- TestNetscapePlugin/Tests/ToStringAndValueOfObject.cpp
- TestNetscapePlugin/Tests/URLRedirect.cpp
</del><ins>+ TestNetscapePlugIn/Tests/DocumentOpenInDestroyStream.cpp
+ TestNetscapePlugIn/Tests/EvaluateJSAfterRemovingPluginElement.cpp
+ TestNetscapePlugIn/Tests/FormValue.cpp
+ TestNetscapePlugIn/Tests/GetURLNotifyWithURLThatFailsToLoad.cpp
+ TestNetscapePlugIn/Tests/GetURLWithJavaScriptURL.cpp
+ TestNetscapePlugIn/Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp
+ TestNetscapePlugIn/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp
+ TestNetscapePlugIn/Tests/LogNPPSetWindow.cpp
+ TestNetscapePlugIn/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
+ TestNetscapePlugIn/Tests/NPPNewFails.cpp
+ TestNetscapePlugIn/Tests/NPPSetWindowCalledDuringDestruction.cpp
+ TestNetscapePlugIn/Tests/NPRuntimeCallsWithNullNPP.cpp
+ TestNetscapePlugIn/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp
+ TestNetscapePlugIn/Tests/NPRuntimeRemoveProperty.cpp
+ TestNetscapePlugIn/Tests/NullNPPGetValuePointer.cpp
+ TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp
+ TestNetscapePlugIn/Tests/PluginScriptableNPObjectInvokeDefault.cpp
+ TestNetscapePlugIn/Tests/PluginScriptableObjectOverridesAllProperties.cpp
+ TestNetscapePlugIn/Tests/PrivateBrowsing.cpp
+ TestNetscapePlugIn/Tests/ToStringAndValueOfObject.cpp
+ TestNetscapePlugIn/Tests/URLRedirect.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><del>-set(TestNetscapePlugin_LIBRARIES
</del><ins>+set(TestNetscapePlugIn_LIBRARIES
</ins><span class="cx"> JavaScriptCore
</span><span class="cx"> WTF
</span><span class="cx"> WebCoreTestSupport
</span><span class="lines">@@ -138,8 +138,8 @@
</span><span class="cx"> add_dependencies(DumpRenderTree DumpRenderTreeBindings)
</span><span class="cx">
</span><span class="cx"> if (ENABLE_NETSCAPE_PLUGIN_API)
</span><del>- add_library(TestNetscapePlugin SHARED ${TestNetscapePlugin_SOURCES})
- target_link_libraries(TestNetscapePlugin ${TestNetscapePlugin_LIBRARIES})
</del><ins>+ add_library(TestNetscapePlugIn SHARED ${TestNetscapePlugIn_SOURCES})
+ target_link_libraries(TestNetscapePlugIn ${TestNetscapePlugIn_LIBRARIES})
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (WIN32)
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (208428 => 208429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-11-09 16:49:19 UTC (rev 208428)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-11-09 16:52:09 UTC (rev 208429)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> endif ()
</span><span class="cx"> link_directories(../../WebKitLibraries)
</span><span class="cx">
</span><del>-list(APPEND TestNetscapePlugin_LIBRARIES
</del><ins>+list(APPEND TestNetscapePlugIn_LIBRARIES
</ins><span class="cx"> ${QUARTZ_LIBRARY}
</span><span class="cx"> WebKit2
</span><span class="cx"> )
</span><span class="lines">@@ -47,18 +47,18 @@
</span><span class="cx"> ${WTF_DIR}/icu
</span><span class="cx"> )
</span><span class="cx">
</span><del>-# Common ${TestNetscapePlugin_SOURCES} from CMakeLists.txt are C++ source files.
-list(APPEND TestNetscapePlugin_Cpp_SOURCES
- ${TestNetscapePlugin_SOURCES}
</del><ins>+# Common ${TestNetscapePlugIn_SOURCES} from CMakeLists.txt are C++ source files.
+list(APPEND TestNetscapePlugIn_Cpp_SOURCES
+ ${TestNetscapePlugIn_SOURCES}
</ins><span class="cx"> )
</span><span class="cx">
</span><del>-list(APPEND TestNetscapePlugin_ObjCpp_SOURCES
</del><ins>+list(APPEND TestNetscapePlugIn_ObjCpp_SOURCES
</ins><span class="cx"> TestNetscapePlugIn/PluginObjectMac.mm
</span><span class="cx"> )
</span><span class="cx">
</span><del>-set(TestNetscapePlugin_SOURCES
- ${TestNetscapePlugin_Cpp_SOURCES}
- ${TestNetscapePlugin_ObjCpp_SOURCES}
</del><ins>+set(TestNetscapePlugIn_SOURCES
+ ${TestNetscapePlugIn_Cpp_SOURCES}
+ ${TestNetscapePlugIn_ObjCpp_SOURCES}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Common ${DumpRenderTree_SOURCES} from CMakeLists.txt are C++ source files.
</span><span class="lines">@@ -124,11 +124,11 @@
</span><span class="cx"> set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-std=c99")
</span><span class="cx"> endforeach ()
</span><span class="cx">
</span><del>-foreach (_file ${DumpRenderTree_Cpp_SOURCES} ${TestNetscapePlugin_Cpp_SOURCES})
</del><ins>+foreach (_file ${DumpRenderTree_Cpp_SOURCES} ${TestNetscapePlugIn_Cpp_SOURCES})
</ins><span class="cx"> set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-std=c++14")
</span><span class="cx"> endforeach ()
</span><span class="cx">
</span><del>-foreach (_file ${DumpRenderTree_ObjCpp_SOURCES} ${TestNetscapePlugin_ObjCpp_SOURCES})
</del><ins>+foreach (_file ${DumpRenderTree_ObjCpp_SOURCES} ${TestNetscapePlugIn_ObjCpp_SOURCES})
</ins><span class="cx"> set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++14")
</span><span class="cx"> endforeach ()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (208428 => 208429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-11-09 16:49:19 UTC (rev 208428)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-11-09 16:52:09 UTC (rev 208429)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> win/WorkQueueItemWin.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><del>-list(APPEND TestNetscapePlugin_LIBRARIES
</del><ins>+list(APPEND TestNetscapePlugIn_LIBRARIES
</ins><span class="cx"> WebKit
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -31,21 +31,21 @@
</span><span class="cx"> ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><del>-list(APPEND TestNetscapePlugin_SOURCES
</del><ins>+list(APPEND TestNetscapePlugIn_SOURCES
</ins><span class="cx"> win/TestNetscapePlugin.def
</span><span class="cx"> win/TestNetscapePlugin.rc
</span><span class="cx">
</span><del>- TestNetscapePlugin/Tests/win/CallJSThatDestroysPlugin.cpp
- TestNetscapePlugin/Tests/win/DrawsGradient.cpp
- TestNetscapePlugin/Tests/win/DumpWindowRect.cpp
- TestNetscapePlugin/Tests/win/GetValueNetscapeWindow.cpp
- TestNetscapePlugin/Tests/win/NPNInvalidateRectInvalidatesWindow.cpp
- TestNetscapePlugin/Tests/win/WindowGeometryInitializedBeforeSetWindow.cpp
- TestNetscapePlugin/Tests/win/WindowRegionIsSetToClipRect.cpp
- TestNetscapePlugin/Tests/win/WindowlessPaintRectCoordinates.cpp
</del><ins>+ TestNetscapePlugIn/Tests/win/CallJSThatDestroysPlugin.cpp
+ TestNetscapePlugIn/Tests/win/DrawsGradient.cpp
+ TestNetscapePlugIn/Tests/win/DumpWindowRect.cpp
+ TestNetscapePlugIn/Tests/win/GetValueNetscapeWindow.cpp
+ TestNetscapePlugIn/Tests/win/NPNInvalidateRectInvalidatesWindow.cpp
+ TestNetscapePlugIn/Tests/win/WindowGeometryInitializedBeforeSetWindow.cpp
+ TestNetscapePlugIn/Tests/win/WindowRegionIsSetToClipRect.cpp
+ TestNetscapePlugIn/Tests/win/WindowlessPaintRectCoordinates.cpp
</ins><span class="cx">
</span><del>- TestNetscapePlugin/win/WindowGeometryTest.cpp
- TestNetscapePlugin/win/WindowedPluginTest.cpp
</del><ins>+ TestNetscapePlugIn/win/WindowGeometryTest.cpp
+ TestNetscapePlugIn/win/WindowedPluginTest.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (${WTF_PLATFORM_WIN_CAIRO})
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> add_definitions(-DWIN_CAIRO)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-list(APPEND TestNetscapePlugin_LIBRARIES
</del><ins>+list(APPEND TestNetscapePlugIn_LIBRARIES
</ins><span class="cx"> Msimg32
</span><span class="cx"> Shlwapi
</span><span class="cx"> WebKit
</span><span class="lines">@@ -70,11 +70,11 @@
</span><span class="cx">
</span><span class="cx"> list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
</span><span class="cx"> win
</span><del>- TestNetscapePlugin
- TestNetscapePlugin/ForwardingHeaders
- TestNetscapePlugin/Tests
- TestNetscapePlugin/win
- TestNetscapePlugin/Tests/win
</del><ins>+ TestNetscapePlugIn
+ TestNetscapePlugIn/ForwardingHeaders
+ TestNetscapePlugIn/Tests
+ TestNetscapePlugIn/win
+ TestNetscapePlugIn/Tests/win
</ins><span class="cx"> ${WEBKIT_DIR}/win
</span><span class="cx"> ${DERIVED_SOURCES_DIR}/WebKit/Interfaces
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestNetscapePlugInCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt (208428 => 208429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2016-11-09 16:49:19 UTC (rev 208428)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2016-11-09 16:52:09 UTC (rev 208429)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> set(WEBKIT_TESTNETSCAPEPLUGIN_DIR "${TOOLS_DIR}/DumpRenderTree/TestNetscapePlugIn")
</span><span class="cx">
</span><del>-set(WebKitTestNetscapePlugin_SOURCES
</del><ins>+set(WebKitTestNetscapePlugIn_SOURCES
</ins><span class="cx"> ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/PluginObject.cpp
</span><span class="cx"> ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/PluginTest.cpp
</span><span class="cx"> ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/TestObject.cpp
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/x11/CallInvalidateRectWithNullNPPArgument.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><del>-set(WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES
</del><ins>+set(WebKitTestNetscapePlugIn_INCLUDE_DIRECTORIES
</ins><span class="cx"> ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}
</span><span class="cx"> ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/ForwardingHeaders
</span><span class="cx"> ${WEBCORE_DIR}
</span><span class="lines">@@ -37,14 +37,14 @@
</span><span class="cx"> ${WTF_DIR}
</span><span class="cx"> )
</span><span class="cx">
</span><del>-set(WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES
</del><ins>+set(WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES
</ins><span class="cx"> ${X11_INCLUDE_DIR}
</span><span class="cx"> )
</span><span class="cx">
</span><del>-include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES})
</del><ins>+include_directories(${WebKitTestNetscapePlugIn_INCLUDE_DIRECTORIES})
+include_directories(SYSTEM ${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES})
</ins><span class="cx">
</span><del>-set(WebKitTestNetscapePlugin_LIBRARIES
</del><ins>+set(WebKitTestNetscapePlugIn_LIBRARIES
</ins><span class="cx"> ${X11_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -52,10 +52,10 @@
</span><span class="cx"> add_definitions(-DXP_UNIX)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-add_library(TestNetscapePlugin SHARED ${WebKitTestNetscapePlugin_SOURCES})
-target_link_libraries(TestNetscapePlugin ${WebKitTestNetscapePlugin_LIBRARIES})
-set_target_properties(TestNetscapePlugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins)
-WEBKIT_SET_EXTRA_COMPILER_FLAGS(TestNetscapePlugin)
</del><ins>+add_library(TestNetscapePlugIn SHARED ${WebKitTestNetscapePlugIn_SOURCES})
+target_link_libraries(TestNetscapePlugIn ${WebKitTestNetscapePlugIn_LIBRARIES})
+set_target_properties(TestNetscapePlugIn PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins)
+WEBKIT_SET_EXTRA_COMPILER_FLAGS(TestNetscapePlugIn)
</ins><span class="cx">
</span><span class="cx"> # Suppress unused parameter warnings for sources in WebKit2.
</span><del>-ADD_TARGET_PROPERTIES(TestNetscapePlugin COMPILE_FLAGS "-Wno-unused-parameter")
</del><ins>+ADD_TARGET_PROPERTIES(TestNetscapePlugIn COMPILE_FLAGS "-Wno-unused-parameter")
</ins></span></pre></div>
<a id="trunkToolsMiniBrowsermacCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/CMakeLists.txt (208428 => 208429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/CMakeLists.txt 2016-11-09 16:49:19 UTC (rev 208428)
+++ trunk/Tools/MiniBrowser/mac/CMakeLists.txt 2016-11-09 16:52:09 UTC (rev 208429)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> ${MINIBROWSER_DIR}/WK2BrowserWindowController.m
</span><span class="cx"> ${MINIBROWSER_DIR}/main.m
</span><span class="cx"> ${TOOLS_DIR}/MiniBrowser/MBToolbarItem.m
</span><del>- ${TOOLS_DIR}/MiniBrowser/MiniBrowserWebProcessPlugin.m
</del><ins>+ ${TOOLS_DIR}/MiniBrowser/MiniBrowserWebProcessPlugIn.m
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(MiniBrowser_INCLUDE_DIRECTORIES
</span></span></pre>
</div>
</div>
</body>
</html>