Title: [194429] trunk/Source/WebCore
- Revision
- 194429
- Author
- [email protected]
- Date
- 2015-12-28 09:21:15 -0800 (Mon, 28 Dec 2015)
Log Message
[CMake][EFL] Fix build breaks when enabling GAMEPAD
https://bugs.webkit.org/show_bug.cgi?id=152573
Reviewed by Alex Christensen.
When enabling GAMEPAD feature on EFL and GTK, there are build breaks.
Fixed all.
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (194428 => 194429)
--- trunk/Source/WebCore/CMakeLists.txt 2015-12-28 16:26:24 UTC (rev 194428)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-12-28 17:21:15 UTC (rev 194429)
@@ -794,11 +794,6 @@
svg/SVGZoomEvent.idl
)
-set(WebCore_IDL_FILES
- ${WebCore_NON_SVG_IDL_FILES}
- ${WebCore_SVG_IDL_FILES}
-)
-
if (WIN32 AND INTERNAL_BUILD)
set(_javascript_Core_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/_javascript_Core/Scripts")
else ()
@@ -2827,6 +2822,58 @@
xml/parser/XMLDocumentParserScope.cpp
)
+if (ENABLE_GAMEPAD)
+ list(APPEND WebCore_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/Modules/gamepad"
+ )
+
+ list(APPEND WebCore_IDL_INCLUDES
+ Modules/gamepad
+ )
+
+ list(APPEND WebCore_NON_SVG_IDL_FILES
+ Modules/gamepad/Gamepad.idl
+ Modules/gamepad/GamepadButton.idl
+ Modules/gamepad/GamepadEvent.idl
+ Modules/gamepad/NavigatorGamepad.idl
+ )
+
+ list(APPEND WebCore_SOURCES
+ Modules/gamepad/Gamepad.cpp
+ Modules/gamepad/GamepadButton.cpp
+ Modules/gamepad/GamepadEvent.cpp
+ Modules/gamepad/GamepadManager.cpp
+ Modules/gamepad/NavigatorGamepad.cpp
+
+ platform/GamepadProvider.cpp
+ )
+elseif (ENABLE_GAMEPAD_DEPRECATED)
+ list(APPEND WebCore_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/Modules/gamepad/deprecated"
+ )
+
+ list(APPEND WebCore_IDL_INCLUDES
+ Modules/gamepad/deprecated
+ )
+
+ list(APPEND WebCore_NON_SVG_IDL_FILES
+ Modules/gamepad/deprecated/Gamepad.idl
+ Modules/gamepad/deprecated/GamepadList.idl
+ Modules/gamepad/deprecated/NavigatorGamepad.idl
+ )
+
+ list(APPEND WebCore_SOURCES
+ Modules/gamepad/deprecated/Gamepad.cpp
+ Modules/gamepad/deprecated/GamepadList.cpp
+ Modules/gamepad/deprecated/NavigatorGamepad.cpp
+ )
+endif ()
+
+set(WebCore_IDL_FILES
+ ${WebCore_NON_SVG_IDL_FILES}
+ ${WebCore_SVG_IDL_FILES}
+)
+
if (ENABLE_ALLINONE_BUILD)
message(STATUS "All-in-One build is enabled.")
set(allInOnes
@@ -3232,43 +3279,6 @@
)
endif ()
-if (ENABLE_GAMEPAD)
- list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/Modules/gamepad"
- )
-
- list(APPEND WebCore_IDL_INCLUDES
- Modules/gamepad
- )
-
- list(APPEND WebCore_NON_SVG_IDL_FILES
- Modules/gamepad/Gamepad.idl
- Modules/gamepad/GamepadButton.idl
- Modules/gamepad/GamepadEvent.idl
- Modules/gamepad/NavigatorGamepad.idl
- )
-elseif (ENABLE_GAMEPAD_DEPRECATED)
- list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/Modules/gamepad/deprecated"
- )
-
- list(APPEND WebCore_IDL_INCLUDES
- Modules/gamepad/deprecated
- )
-
- list(APPEND WebCore_NON_SVG_IDL_FILES
- Modules/gamepad/deprecated/Gamepad.idl
- Modules/gamepad/deprecated/GamepadList.idl
- Modules/gamepad/deprecated/NavigatorGamepad.idl
- )
-
- list(APPEND WebCore_SOURCES
- Modules/gamepad/deprecated/Gamepad.cpp
- Modules/gamepad/deprecated/GamepadList.cpp
- Modules/gamepad/deprecated/NavigatorGamepad.cpp
- )
-endif ()
-
if (ENABLE_WEB_REPLAY)
list(APPEND WebCore_INCLUDE_DIRECTORIES
"${_javascript_CORE_DIR}/inspector"
Modified: trunk/Source/WebCore/ChangeLog (194428 => 194429)
--- trunk/Source/WebCore/ChangeLog 2015-12-28 16:26:24 UTC (rev 194428)
+++ trunk/Source/WebCore/ChangeLog 2015-12-28 17:21:15 UTC (rev 194429)
@@ -1,3 +1,15 @@
+2015-12-28 Gyuyoung Kim <[email protected]>
+
+ [CMake][EFL] Fix build breaks when enabling GAMEPAD
+ https://bugs.webkit.org/show_bug.cgi?id=152573
+
+ Reviewed by Alex Christensen.
+
+ When enabling GAMEPAD feature on EFL and GTK, there are build breaks.
+ Fixed all.
+
+ * CMakeLists.txt:
+
2015-12-25 Andy Estes <[email protected]>
Stop moving local objects in return statements
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
