Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (188693 => 188694)
--- trunk/Source/_javascript_Core/ChangeLog 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-08-20 19:08:06 UTC (rev 188694)
@@ -1,3 +1,13 @@
+2015-08-20 Alex Christensen <[email protected]>
+
+ Clean up CMake build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148234
+
+ Reviewed by Tim Horton.
+
+ * shell/PlatformWin.cmake:
+ Define WIN_CAIRO so the WinCairo jsc.exe can find the correct dlls.
+
2015-08-20 Mark Lam <[email protected]>
A watchdog tests is failing on Windows.
Modified: trunk/Source/_javascript_Core/shell/PlatformWin.cmake (188693 => 188694)
--- trunk/Source/_javascript_Core/shell/PlatformWin.cmake 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/_javascript_Core/shell/PlatformWin.cmake 2015-08-20 19:08:06 UTC (rev 188694)
@@ -4,6 +4,10 @@
set_target_properties(jscdll PROPERTIES FOLDER "_javascript_Core")
set_target_properties(jscdll PROPERTIES OUTPUT_NAME "jsc${DEBUG_SUFFIX}")
+if (${WTF_PLATFORM_WIN_CAIRO})
+ add_definitions(-DWIN_CAIRO)
+endif ()
+
set(JSC_SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
set(JSC_LIBRARIES shlwapi)
add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
Modified: trunk/Source/ThirdParty/ANGLE/CMakeLists.txt (188693 => 188694)
--- trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2015-08-20 19:08:06 UTC (rev 188694)
@@ -278,6 +278,31 @@
libANGLE
)
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl)
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLES2)
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLSLANG)
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr)
+file(GLOB _files_ANGLE "${THIRDPARTY_DIR}/ANGLE/ANGLE/*.h")
+file(GLOB _files_egl "${THIRDPARTY_DIR}/ANGLE/include/egl/*.h")
+file(GLOB _files_GLES2 "${THIRDPARTY_DIR}/ANGLE/include/GLES2/*.h")
+file(GLOB _files_GLSLANG "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG/*.h")
+file(GLOB _files_khr "${THIRDPARTY_DIR}/ANGLE/include/khr/*.h")
+foreach (_file ${_files_ANGLE})
+ file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/)
+endforeach ()
+foreach (_file ${_files_egl})
+ file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl)
+endforeach ()
+foreach (_file ${_files_GLES2})
+ file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLES2)
+endforeach ()
+foreach (_file ${_files_GLSLANG})
+ file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLSLANG)
+endforeach ()
+foreach (_file ${_files_khr})
+ file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr)
+endforeach ()
+
set_target_properties(libANGLE PROPERTIES FOLDER "ANGLE")
set_target_properties(libEGL PROPERTIES FOLDER "ANGLE")
set_target_properties(libGLESv2 PROPERTIES FOLDER "ANGLE")
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (188693 => 188694)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-08-20 19:08:06 UTC (rev 188694)
@@ -1,3 +1,13 @@
+2015-08-20 Alex Christensen <[email protected]>
+
+ Clean up CMake build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148234
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ Copy headers to forwarding headers.
+
2015-08-11 Brent Fulgham <[email protected]>
[Win] Switch Windows build to Visual Studio 2015
Modified: trunk/Source/ThirdParty/ChangeLog (188693 => 188694)
--- trunk/Source/ThirdParty/ChangeLog 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/ThirdParty/ChangeLog 2015-08-20 19:08:06 UTC (rev 188694)
@@ -1,3 +1,13 @@
+2015-08-20 Alex Christensen <[email protected]>
+
+ Clean up CMake build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148234
+
+ Reviewed by Tim Horton.
+
+ * gtest/CMakeLists.txt:
+ gtest needs to be a static library on Windows to not crash.
+
2015-08-11 Brent Fulgham <[email protected]>
[Win] Switch Windows build to Visual Studio 2015
Modified: trunk/Source/ThirdParty/gtest/CMakeLists.txt (188693 => 188694)
--- trunk/Source/ThirdParty/gtest/CMakeLists.txt 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/ThirdParty/gtest/CMakeLists.txt 2015-08-20 19:08:06 UTC (rev 188694)
@@ -26,12 +26,16 @@
if (WIN32)
# MSVC 2015 requires this definition for INTMAX_MAX to be defined.
- add_definitions(-D__STDC_LIMIT_MACROS)
+ add_definitions(-D__STDC_LIMIT_MACROS -DGTEST_CREATE_SHARED_LIBRARY=0)
+ # gtest crashes on exit on Windows if it is a dll.
+ add_library(gtest STATIC ${GTEST_SOURCES})
+else ()
+ add_definitions(-DGTEST_CREATE_SHARED_LIBRARY=1)
+ add_library(gtest SHARED ${GTEST_SOURCES})
endif ()
-add_library(gtest SHARED ${GTEST_SOURCES})
include_directories(${GTEST_INCLUDE_DIRECTORIES})
-add_definitions(-DGTEST_CREATE_SHARED_LIBRARY=1 -DGTEST_HAS_RTTI=0)
+add_definitions(-DGTEST_HAS_RTTI=0)
# FIXME: This works around compatibility problems in the old version of the third-pary
# googletest source code checkout. It should be removed once we upgrade to a newer version.
Modified: trunk/Source/WebCore/CMakeLists.txt (188693 => 188694)
--- trunk/Source/WebCore/CMakeLists.txt 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-20 19:08:06 UTC (rev 188694)
@@ -3187,11 +3187,6 @@
)
endif ()
-list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${THIRDPARTY_DIR}/ANGLE/"
- "${THIRDPARTY_DIR}/ANGLE/include/KHR"
-)
-
if (ENABLE_WEB_REPLAY)
list(APPEND WebCore_INCLUDE_DIRECTORIES
"${_javascript_CORE_DIR}/inspector"
Modified: trunk/Source/WebCore/ChangeLog (188693 => 188694)
--- trunk/Source/WebCore/ChangeLog 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/WebCore/ChangeLog 2015-08-20 19:08:06 UTC (rev 188694)
@@ -1,3 +1,17 @@
+2015-08-20 Alex Christensen <[email protected]>
+
+ Clean up CMake build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148234
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformWin.cmake:
+ Make including ANGLE headers platform specific because EFL and GTK don't want to copy headers,
+ but we need to in order to get the Windows build working with each Source subdirectory isolated.
+
2015-08-20 Beth Dakin <[email protected]>
Standalone image documents should send their size to the UIClient just like
Modified: trunk/Source/WebCore/PlatformEfl.cmake (188693 => 188694)
--- trunk/Source/WebCore/PlatformEfl.cmake 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-08-20 19:08:06 UTC (rev 188694)
@@ -18,6 +18,8 @@
"${_javascript_CORE_DIR}/profiler"
"${_javascript_CORE_DIR}/runtime"
"${_javascript_CORE_DIR}/yarr"
+ "${THIRDPARTY_DIR}/ANGLE/"
+ "${THIRDPARTY_DIR}/ANGLE/include/KHR"
"${WEBCORE_DIR}/editing/atk"
"${WEBCORE_DIR}/page/efl"
"${WEBCORE_DIR}/page/scrolling/coordinatedgraphics"
Modified: trunk/Source/WebCore/PlatformGTK.cmake (188693 => 188694)
--- trunk/Source/WebCore/PlatformGTK.cmake 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-08-20 19:08:06 UTC (rev 188694)
@@ -20,6 +20,8 @@
"${_javascript_CORE_DIR}/profiler"
"${_javascript_CORE_DIR}/runtime"
"${_javascript_CORE_DIR}/yarr"
+ "${THIRDPARTY_DIR}/ANGLE/"
+ "${THIRDPARTY_DIR}/ANGLE/include/KHR"
"${WEBCORE_DIR}/accessibility/atk"
"${WEBCORE_DIR}/editing/atk"
"${WEBCORE_DIR}/page/gtk"
Modified: trunk/Source/WebCore/PlatformWin.cmake (188693 => 188694)
--- trunk/Source/WebCore/PlatformWin.cmake 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-08-20 19:08:06 UTC (rev 188694)
@@ -1,6 +1,8 @@
add_definitions(/bigobj)
list(APPEND WebCore_INCLUDE_DIRECTORIES
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/KHR"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/ForwardingHeaders"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/API"
@@ -258,6 +260,14 @@
DESTINATION
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj
)
+if (${WTF_PLATFORM_WIN_CAIRO} AND EXISTS ${WEBKIT_LIBRARIES_DIR}/cacert.pem)
+ make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/certificates)
+ file(COPY
+ ${WEBKIT_LIBRARIES_DIR}/cacert.pem
+ DESTINATION
+ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/certificates
+ )
+endif ()
file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore)
Modified: trunk/Source/WebKit/ChangeLog (188693 => 188694)
--- trunk/Source/WebKit/ChangeLog 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/WebKit/ChangeLog 2015-08-20 19:08:06 UTC (rev 188694)
@@ -1,3 +1,13 @@
+2015-08-20 Alex Christensen <[email protected]>
+
+ Clean up CMake build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148234
+
+ Reviewed by Tim Horton.
+
+ * PlatformWin.cmake:
+ Include ANGLE forwarding headers directories.
+
2015-08-19 Alex Christensen <[email protected]>
CMake Windows build should not include files directly from other Source directories
Modified: trunk/Source/WebKit/PlatformWin.cmake (188693 => 188694)
--- trunk/Source/WebKit/PlatformWin.cmake 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/WebKit/PlatformWin.cmake 2015-08-20 19:08:06 UTC (rev 188694)
@@ -57,6 +57,10 @@
"${DERIVED_SOURCES_WEBKIT_DIR}/include"
"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"
"${DERIVED_SOURCES_DIR}"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr"
)
list(APPEND WebKit_INCLUDES
Modified: trunk/Tools/ChangeLog (188693 => 188694)
--- trunk/Tools/ChangeLog 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Tools/ChangeLog 2015-08-20 19:08:06 UTC (rev 188694)
@@ -1,3 +1,16 @@
+2015-08-20 Alex Christensen <[email protected]>
+
+ Clean up CMake build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148234
+
+ Reviewed by Tim Horton.
+
+ * DumpRenderTree/PlatformWin.cmake:
+ * TestWebKitAPI/CMakeLists.txt:
+ * TestWebKitAPI/PlatformWin.cmake:
+ Define WIN_CAIRO so WinCairo executables can find the correct dlls in WebKitLibraries.
+ gtest needs to be a static library on Windows to not crash.
+
2015-08-19 Alex Christensen <[email protected]>
CMake Windows build should not include files directly from other Source directories
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (188693 => 188694)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-20 19:08:06 UTC (rev 188694)
@@ -44,6 +44,10 @@
TestNetscapePlugin/win/WindowedPluginTest.cpp
)
+if (${WTF_PLATFORM_WIN_CAIRO})
+ add_definitions(-DWIN_CAIRO)
+endif ()
+
list(APPEND TestNetscapePlugin_LIBRARIES
Msimg32
Shlwapi
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (188693 => 188694)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-08-20 19:08:06 UTC (rev 188694)
@@ -146,7 +146,13 @@
get_property(TestWebKitAPIInjectedBundle_PATH TARGET TestWebKitAPIInjectedBundle PROPERTY LOCATION)
endif ()
-add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1 -DGTEST_HAS_RTTI=0
+if (WIN32)
+ add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=0)
+else ()
+ add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
+endif ()
+
+add_definitions(-DGTEST_HAS_RTTI=0
-DTEST_WEBKIT2_RESOURCES_DIR=\"${TESTWEBKITAPI_DIR}/Tests/WebKit2\"
-DTEST_INJECTED_BUNDLE_PATH=\"${TestWebKitAPIInjectedBundle_PATH}\"
)
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (188693 => 188694)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-08-20 19:08:06 UTC (rev 188694)
@@ -2,6 +2,10 @@
set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}")
add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
+if (${WTF_PLATFORM_WIN_CAIRO})
+ add_definitions(-DWIN_CAIRO)
+endif ()
+
set(test_main_SOURCES
${TESTWEBKITAPI_DIR}/win/main.cpp
)
