Diff
Modified: trunk/ChangeLog (113763 => 113764)
--- trunk/ChangeLog 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/ChangeLog 2012-04-10 21:07:26 UTC (rev 113764)
@@ -1,3 +1,16 @@
+2012-04-10 Patrick Gansterer <[email protected]>
+
+ [CMake] Enable USE_FOLDERS property
+ https://bugs.webkit.org/show_bug.cgi?id=83571
+
+ Reviewed by Daniel Bates.
+
+ Setting the FOLDER property on targets gives more structure
+ to the generated Visual Studio solutions.
+ This does not affect other CMake generators.
+
+ * Source/cmake/OptionsCommon.cmake:
+
2012-04-06 Ryosuke Niwa <[email protected]>
Update perf-o-matic config.js per upstream change.
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (113763 => 113764)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2012-04-10 21:07:26 UTC (rev 113764)
@@ -309,6 +309,7 @@
ADD_DEFINITIONS(-DBUILDING_JavaScriptCore)
ADD_LIBRARY(${_javascript_Core_LIBRARY_NAME} ${_javascript_Core_LIBRARY_TYPE} ${_javascript_Core_HEADERS} ${_javascript_Core_SOURCES})
TARGET_LINK_LIBRARIES(${_javascript_Core_LIBRARY_NAME} ${_javascript_Core_LIBRARIES})
+SET_TARGET_PROPERTIES(${_javascript_Core_LIBRARY_NAME} PROPERTIES FOLDER "_javascript_Core")
SET_TARGET_PROPERTIES(${_javascript_Core_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
IF (_javascript_Core_LINK_FLAGS)
Modified: trunk/Source/_javascript_Core/ChangeLog (113763 => 113764)
--- trunk/Source/_javascript_Core/ChangeLog 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-04-10 21:07:26 UTC (rev 113764)
@@ -1,3 +1,17 @@
+2012-04-10 Patrick Gansterer <[email protected]>
+
+ [CMake] Enable USE_FOLDERS property
+ https://bugs.webkit.org/show_bug.cgi?id=83571
+
+ Reviewed by Daniel Bates.
+
+ Setting the FOLDER property on targets gives more structure
+ to the generated Visual Studio solutions.
+ This does not affect other CMake generators.
+
+ * CMakeLists.txt:
+ * shell/CMakeLists.txt:
+
2012-04-10 Filip Pizlo <[email protected]>
It should be possible to see why a code block was not compiled by the DFG
Modified: trunk/Source/_javascript_Core/shell/CMakeLists.txt (113763 => 113764)
--- trunk/Source/_javascript_Core/shell/CMakeLists.txt 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Source/_javascript_Core/shell/CMakeLists.txt 2012-04-10 21:07:26 UTC (rev 113764)
@@ -12,6 +12,7 @@
INCLUDE_DIRECTORIES(./ ${_javascript_Core_INCLUDE_DIRECTORIES})
ADD_EXECUTABLE(${JSC_EXECUTABLE_NAME} ${JSC_SOURCES})
TARGET_LINK_LIBRARIES(${JSC_EXECUTABLE_NAME} ${JSC_LIBRARIES})
+SET_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} PROPERTIES FOLDER "_javascript_Core")
IF (JSC_LINK_FLAGS)
ADD_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} LINK_FLAGS "${JSC_LINK_FLAGS}")
Modified: trunk/Source/WTF/ChangeLog (113763 => 113764)
--- trunk/Source/WTF/ChangeLog 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Source/WTF/ChangeLog 2012-04-10 21:07:26 UTC (rev 113764)
@@ -1,3 +1,16 @@
+2012-04-10 Patrick Gansterer <[email protected]>
+
+ [CMake] Enable USE_FOLDERS property
+ https://bugs.webkit.org/show_bug.cgi?id=83571
+
+ Reviewed by Daniel Bates.
+
+ Setting the FOLDER property on targets gives more structure
+ to the generated Visual Studio solutions.
+ This does not affect other CMake generators.
+
+ * wtf/CMakeLists.txt:
+
2012-04-09 Patrick Gansterer <[email protected]>
Port BinarySemaphoreWin.cpp to WinCE
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (113763 => 113764)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2012-04-10 21:07:26 UTC (rev 113764)
@@ -207,6 +207,7 @@
ADD_DEFINITIONS(-DBUILDING_WTF)
ADD_LIBRARY(${WTF_LIBRARY_NAME} STATIC ${WTF_HEADERS} ${WTF_SOURCES})
TARGET_LINK_LIBRARIES(${WTF_LIBRARY_NAME} ${WTF_LIBRARIES})
+SET_TARGET_PROPERTIES(${WTF_LIBRARY_NAME} PROPERTIES FOLDER "_javascript_Core")
IF (WTF_LINK_FLAGS)
ADD_TARGET_PROPERTIES(${WTF_LIBRARY_NAME} LINK_FLAGS "${WTF_LINK_FLAGS}")
Modified: trunk/Source/WebCore/CMakeLists.txt (113763 => 113764)
--- trunk/Source/WebCore/CMakeLists.txt 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-04-10 21:07:26 UTC (rev 113764)
@@ -2624,9 +2624,11 @@
INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES})
ADD_LIBRARY(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
+SET_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} PROPERTIES FOLDER "WebCore")
SET_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
ADD_LIBRARY(${WebCoreTestSupport_LIBRARY_NAME} ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
+SET_TARGET_PROPERTIES(${WebCoreTestSupport_LIBRARY_NAME} PROPERTIES FOLDER "WebCore")
ADD_DEPENDENCIES(${WebCore_LIBRARY_NAME} ${_javascript_Core_LIBRARY_NAME})
ADD_DEPENDENCIES(${WebCoreTestSupport_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
Modified: trunk/Source/WebCore/ChangeLog (113763 => 113764)
--- trunk/Source/WebCore/ChangeLog 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Source/WebCore/ChangeLog 2012-04-10 21:07:26 UTC (rev 113764)
@@ -1,3 +1,16 @@
+2012-04-10 Patrick Gansterer <[email protected]>
+
+ [CMake] Enable USE_FOLDERS property
+ https://bugs.webkit.org/show_bug.cgi?id=83571
+
+ Reviewed by Daniel Bates.
+
+ Setting the FOLDER property on targets gives more structure
+ to the generated Visual Studio solutions.
+ This does not affect other CMake generators.
+
+ * CMakeLists.txt:
+
2012-04-10 Dominik Röttsches <[email protected]>
[CMake] CMake SVG Code Generation fails to generate code for extra defines
Modified: trunk/Source/WebKit/CMakeLists.txt (113763 => 113764)
--- trunk/Source/WebKit/CMakeLists.txt 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Source/WebKit/CMakeLists.txt 2012-04-10 21:07:26 UTC (rev 113764)
@@ -74,6 +74,7 @@
ADD_LIBRARY(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
ADD_DEPENDENCIES(${WebKit_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
TARGET_LINK_LIBRARIES(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARIES})
+SET_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} PROPERTIES FOLDER "WebKit")
SET_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
IF (WebKit_LINK_FLAGS)
Modified: trunk/Source/WebKit/ChangeLog (113763 => 113764)
--- trunk/Source/WebKit/ChangeLog 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Source/WebKit/ChangeLog 2012-04-10 21:07:26 UTC (rev 113764)
@@ -1,3 +1,16 @@
+2012-04-10 Patrick Gansterer <[email protected]>
+
+ [CMake] Enable USE_FOLDERS property
+ https://bugs.webkit.org/show_bug.cgi?id=83571
+
+ Reviewed by Daniel Bates.
+
+ Setting the FOLDER property on targets gives more structure
+ to the generated Visual Studio solutions.
+ This does not affect other CMake generators.
+
+ * CMakeLists.txt:
+
2012-04-07 Patrick Gansterer <[email protected]>
[CMake] Cleanup WTF include directories
Modified: trunk/Source/WebKit2/CMakeLists.txt (113763 => 113764)
--- trunk/Source/WebKit2/CMakeLists.txt 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Source/WebKit2/CMakeLists.txt 2012-04-10 21:07:26 UTC (rev 113764)
@@ -529,10 +529,12 @@
ADD_DEPENDENCIES(${WebKit2_LIBRARY_NAME} ${ForwardingHeaders_NAME})
ADD_DEPENDENCIES(${WebKit2_LIBRARY_NAME} ${ForwardingNetworkHeaders_NAME})
TARGET_LINK_LIBRARIES(${WebKit2_LIBRARY_NAME} ${WebKit2_LIBRARIES})
+SET_TARGET_PROPERTIES(${WebKit2_LIBRARY_NAME} PROPERTIES FOLDER "WebKit")
SET_TARGET_PROPERTIES(${WebKit2_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
ADD_EXECUTABLE(${WebProcess_NAME} ${WebProcess_SOURCES})
TARGET_LINK_LIBRARIES(${WebProcess_NAME} ${WebProcess_LIBRARIES})
+SET_TARGET_PROPERTIES(${WebProcess_NAME} PROPERTIES FOLDER "WebKit")
SET_TARGET_PROPERTIES(${WebKit2_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
IF (WebKit2_LINK_FLAGS)
Modified: trunk/Source/WebKit2/ChangeLog (113763 => 113764)
--- trunk/Source/WebKit2/ChangeLog 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Source/WebKit2/ChangeLog 2012-04-10 21:07:26 UTC (rev 113764)
@@ -1,3 +1,16 @@
+2012-04-10 Patrick Gansterer <[email protected]>
+
+ [CMake] Enable USE_FOLDERS property
+ https://bugs.webkit.org/show_bug.cgi?id=83571
+
+ Reviewed by Daniel Bates.
+
+ Setting the FOLDER property on targets gives more structure
+ to the generated Visual Studio solutions.
+ This does not affect other CMake generators.
+
+ * CMakeLists.txt:
+
2012-04-10 Dinu Jacob <[email protected]>
[Qt][WK2] Assertion failure on loading new page after panning/zooming
Modified: trunk/Source/cmake/OptionsCommon.cmake (113763 => 113764)
--- trunk/Source/cmake/OptionsCommon.cmake 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Source/cmake/OptionsCommon.cmake 2012-04-10 21:07:26 UTC (rev 113764)
@@ -15,6 +15,8 @@
SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++")
ENDIF ()
+SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
+
SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
SET(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Where to install libraries (lib${LIB_SUFFIX})")
Modified: trunk/Tools/ChangeLog (113763 => 113764)
--- trunk/Tools/ChangeLog 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Tools/ChangeLog 2012-04-10 21:07:26 UTC (rev 113764)
@@ -1,3 +1,18 @@
+2012-04-10 Patrick Gansterer <[email protected]>
+
+ [CMake] Enable USE_FOLDERS property
+ https://bugs.webkit.org/show_bug.cgi?id=83571
+
+ Reviewed by Daniel Bates.
+
+ Setting the FOLDER property on targets gives more structure
+ to the generated Visual Studio solutions.
+ This does not affect other CMake generators.
+
+ * DumpRenderTree/efl/CMakeLists.txt:
+ * EWebLauncher/CMakeLists.txt:
+ * WinCELauncher/CMakeLists.txt:
+
2012-04-10 David Dorwin <[email protected]>
Add Encrypted Media Extensions methods to HTMLMediaElement
Modified: trunk/Tools/DumpRenderTree/efl/CMakeLists.txt (113763 => 113764)
--- trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2012-04-10 21:07:26 UTC (rev 113764)
@@ -116,9 +116,11 @@
ADD_EXECUTABLE(bin/DumpRenderTree ${DumpRenderTree_SOURCES})
TARGET_LINK_LIBRARIES(bin/DumpRenderTree ${DumpRenderTree_LIBRARIES})
ADD_TARGET_PROPERTIES(bin/DumpRenderTree LINK_FLAGS "${DumpRenderTree_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(bin/DumpRenderTree PROPERTIES FOLDER "Tools")
SET_TARGET_PROPERTIES(bin/DumpRenderTree PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
ADD_EXECUTABLE(bin/ImageDiff ${ImageDiff_SOURCES})
TARGET_LINK_LIBRARIES(bin/ImageDiff ${DumpRenderTree_LIBRARIES})
ADD_TARGET_PROPERTIES(bin/ImageDiff LINK_FLAGS "${DumpRenderTree_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(bin/ImageDiff PROPERTIES FOLDER "Tools")
SET_TARGET_PROPERTIES(bin/ImageDiff PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
Modified: trunk/Tools/EWebLauncher/CMakeLists.txt (113763 => 113764)
--- trunk/Tools/EWebLauncher/CMakeLists.txt 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Tools/EWebLauncher/CMakeLists.txt 2012-04-10 21:07:26 UTC (rev 113764)
@@ -42,4 +42,5 @@
ADD_EXECUTABLE(bin/EWebLauncher ${EWebLauncher_SOURCES})
TARGET_LINK_LIBRARIES(bin/EWebLauncher ${EWebLauncher_LIBRARIES})
ADD_TARGET_PROPERTIES(bin/EWebLauncher LINK_FLAGS "${EWebLauncher_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(bin/EWebLauncher PROPERTIES FOLDER "Tools")
SET_TARGET_PROPERTIES(bin/EWebLauncher PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
Modified: trunk/Tools/WinCELauncher/CMakeLists.txt (113763 => 113764)
--- trunk/Tools/WinCELauncher/CMakeLists.txt 2012-04-10 21:05:26 UTC (rev 113763)
+++ trunk/Tools/WinCELauncher/CMakeLists.txt 2012-04-10 21:07:26 UTC (rev 113764)
@@ -23,4 +23,5 @@
ADD_EXECUTABLE(WinCELauncher ${WinCELauncher_SOURCES})
ADD_DEPENDENCIES(WinCELauncher ${WebKit_LIBRARY_NAME})
TARGET_LINK_LIBRARIES(WinCELauncher ${WinCELauncher_LIBRARIES})
+SET_TARGET_PROPERTIES(WinCELauncher PROPERTIES FOLDER "Tools")
SET_TARGET_PROPERTIES(WinCELauncher PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
