Diff
Modified: trunk/ChangeLog (188341 => 188342)
--- trunk/ChangeLog 2015-08-12 18:56:50 UTC (rev 188341)
+++ trunk/ChangeLog 2015-08-12 19:00:48 UTC (rev 188342)
@@ -1,3 +1,13 @@
+2015-08-12 Alex Christensen <[email protected]>
+
+ Fix Debug CMake builds on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147940
+
+ Reviewed by Chris Dumez.
+
+ * Source/cmake/OptionsWindows.cmake:
+ Put 32-bit binaries in a bin32 subdirectory and 64-bit binaries in a bin64 subdirectory.
+
2015-08-10 Alex Christensen <[email protected]>
Build TestWebKitAPI with CMake on Windows
Modified: trunk/Source/_javascript_Core/ChangeLog (188341 => 188342)
--- trunk/Source/_javascript_Core/ChangeLog 2015-08-12 18:56:50 UTC (rev 188341)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-08-12 19:00:48 UTC (rev 188342)
@@ -1,3 +1,13 @@
+2015-08-12 Alex Christensen <[email protected]>
+
+ Fix Debug CMake builds on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147940
+
+ Reviewed by Chris Dumez.
+
+ * PlatformWin.cmake:
+ Copy the plist to the _javascript_Core.resources directory.
+
2015-08-11 Geoffrey Garen <[email protected]>
Remove VM::releaseExecutableMemory
Modified: trunk/Source/_javascript_Core/PlatformWin.cmake (188341 => 188342)
--- trunk/Source/_javascript_Core/PlatformWin.cmake 2015-08-12 18:56:50 UTC (rev 188341)
+++ trunk/Source/_javascript_Core/PlatformWin.cmake 2015-08-12 19:00:48 UTC (rev 188342)
@@ -27,3 +27,9 @@
list(REMOVE_ITEM _javascript_Core_SOURCES
inspector/JSGlobalObjectInspectorController.cpp
)
+
+file(COPY
+ "${_javascript_CORE_DIR}/_javascript_Core.vcxproj/_javascript_Core.resources"
+ DESTINATION
+ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+)
Modified: trunk/Source/WebCore/ChangeLog (188341 => 188342)
--- trunk/Source/WebCore/ChangeLog 2015-08-12 18:56:50 UTC (rev 188341)
+++ trunk/Source/WebCore/ChangeLog 2015-08-12 19:00:48 UTC (rev 188342)
@@ -1,5 +1,15 @@
2015-08-12 Alex Christensen <[email protected]>
+ Fix Debug CMake builds on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147940
+
+ Reviewed by Chris Dumez.
+
+ * PlatformWin.cmake:
+ Copy localized strings to the WebKit.resources directory.
+
+2015-08-12 Alex Christensen <[email protected]>
+
Unreviewed build fix after r188339.
* bindings/js/GCController.cpp:
Modified: trunk/Source/WebCore/PlatformWin.cmake (188341 => 188342)
--- trunk/Source/WebCore/PlatformWin.cmake 2015-08-12 18:56:50 UTC (rev 188341)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-08-12 19:00:48 UTC (rev 188342)
@@ -224,3 +224,11 @@
WORKING_DIRECTORY "${DERIVED_SOURCES_WEBCORE_DIR}"
COMMAND echo /* Identifying AVFoundation Support */ > WebCoreHeaderDetection.h
VERBATIM)
+
+make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj)
+file(COPY
+ "${WEBCORE_DIR}/English.lproj/Localizable.strings"
+ "${WEBCORE_DIR}/English.lproj/mediaControlsLocalizedStrings.js"
+ DESTINATION
+ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj
+)
Modified: trunk/Source/WebKit/ChangeLog (188341 => 188342)
--- trunk/Source/WebKit/ChangeLog 2015-08-12 18:56:50 UTC (rev 188341)
+++ trunk/Source/WebKit/ChangeLog 2015-08-12 19:00:48 UTC (rev 188342)
@@ -1,3 +1,13 @@
+2015-08-12 Alex Christensen <[email protected]>
+
+ Fix Debug CMake builds on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147940
+
+ Reviewed by Chris Dumez.
+
+ * PlatformWin.cmake:
+ We need /NODEFAULTLIB with the debug version of libraries, too.
+
2015-08-11 Brent Fulgham <[email protected]>
[Win] Switch Windows build to Visual Studio 2015
Modified: trunk/Source/WebKit/PlatformWin.cmake (188341 => 188342)
--- trunk/Source/WebKit/PlatformWin.cmake 2015-08-12 18:56:50 UTC (rev 188341)
+++ trunk/Source/WebKit/PlatformWin.cmake 2015-08-12 19:00:48 UTC (rev 188342)
@@ -447,9 +447,9 @@
set(CMAKE_CXX_STANDARD_LIBRARIES "")
if (${WTF_PLATFORM_WIN_CAIRO})
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD")
else ()
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:MSVCRTD")
endif ()
# If this directory isn't created before midl runs and attempts to output WebKit.tlb,
Modified: trunk/Source/cmake/OptionsWindows.cmake (188341 => 188342)
--- trunk/Source/cmake/OptionsWindows.cmake 2015-08-12 18:56:50 UTC (rev 188341)
+++ trunk/Source/cmake/OptionsWindows.cmake 2015-08-12 19:00:48 UTC (rev 188342)
@@ -110,8 +110,14 @@
include_directories("$ENV{WEBKIT_LIBRARIES}/include")
if (${MSVC_CXX_ARCHITECTURE_ID} STREQUAL "X86")
link_directories("$ENV{WEBKIT_LIBRARIES}/lib32")
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib32)
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib32)
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin32)
else ()
link_directories("$ENV{WEBKIT_LIBRARIES}/lib64")
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib64)
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib64)
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin64)
endif ()
if (MSVC)
Modified: trunk/Tools/ChangeLog (188341 => 188342)
--- trunk/Tools/ChangeLog 2015-08-12 18:56:50 UTC (rev 188341)
+++ trunk/Tools/ChangeLog 2015-08-12 19:00:48 UTC (rev 188342)
@@ -1,3 +1,16 @@
+2015-08-12 Alex Christensen <[email protected]>
+
+ Fix Debug CMake builds on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147940
+
+ Reviewed by Chris Dumez.
+
+ * DumpRenderTree/PlatformWin.cmake:
+ * TestWebKitAPI/PlatformWin.cmake:
+ The BitmapImage test is not enabled on the AppleWin port.
+ * WinLauncher/CMakeLists.txt:
+ Debug builds need /NODEFAULTLIB:MSVCRTD, too.
+
2015-08-12 Carlos Garcia Campos <[email protected]>
Unreviewed. run-gtk-tests: Use a longer timeout for slow tests.
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (188341 => 188342)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-12 18:56:50 UTC (rev 188341)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-12 19:00:48 UTC (rev 188342)
@@ -115,7 +115,7 @@
endif ()
ADD_PRECOMPILED_HEADER("DumpRenderTreePrefix.h" "win/DumpRenderTreePrefix.cpp" DumpRenderTreeLib_SOURCES)
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:MSVCRTD")
add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
add_library(DumpRenderTreeLib SHARED ${DumpRenderTreeLib_SOURCES})
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (188341 => 188342)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-08-12 18:56:50 UTC (rev 188341)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-08-12 19:00:48 UTC (rev 188342)
@@ -24,6 +24,16 @@
gtest
)
+set(TestWebCoreLib_SOURCES
+ ${test_main_SOURCES}
+ ${TESTWEBKITAPI_DIR}/TestsController.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/CalculationValue.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/CSSParser.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/LayoutUnit.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/TimeRanges.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/URL.cpp
+)
+
if (${WTF_PLATFORM_WIN_CAIRO})
list(APPEND test_webcore_LIBRARIES
cairo
@@ -34,6 +44,9 @@
strmiids
vcruntime
)
+ list(APPEND TestWebCoreLib_SOURCES
+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/win/BitmapImage.cpp
+ )
else ()
list(APPEND test_webcore_LIBRARIES
CFNetwork
@@ -56,14 +69,7 @@
)
add_library(TestWebCoreLib SHARED
- ${test_main_SOURCES}
- ${TESTWEBKITAPI_DIR}/TestsController.cpp
- ${TESTWEBKITAPI_DIR}/Tests/WebCore/win/BitmapImage.cpp
- ${TESTWEBKITAPI_DIR}/Tests/WebCore/CalculationValue.cpp
- ${TESTWEBKITAPI_DIR}/Tests/WebCore/CSSParser.cpp
- ${TESTWEBKITAPI_DIR}/Tests/WebCore/LayoutUnit.cpp
- ${TESTWEBKITAPI_DIR}/Tests/WebCore/TimeRanges.cpp
- ${TESTWEBKITAPI_DIR}/Tests/WebCore/URL.cpp
+ ${TestWebCoreLib_SOURCES}
)
target_link_libraries(TestWebCoreLib ${test_webcore_LIBRARIES})
Modified: trunk/Tools/WinLauncher/CMakeLists.txt (188341 => 188342)
--- trunk/Tools/WinLauncher/CMakeLists.txt 2015-08-12 18:56:50 UTC (rev 188341)
+++ trunk/Tools/WinLauncher/CMakeLists.txt 2015-08-12 19:00:48 UTC (rev 188342)
@@ -45,7 +45,7 @@
)
endif ()
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:MSVCRTD")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup")
if (${WTF_PLATFORM_WIN_CAIRO})
