Title: [259563] trunk
- Revision
- 259563
- Author
- [email protected]
- Date
- 2020-04-05 21:22:04 -0700 (Sun, 05 Apr 2020)
Log Message
[CMake] Use WEBKIT_EXECUTABLE in MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=206894
Reviewed by Adrian Perez de Castro.
.:
Add a MiniBrowser derived sources directory.
* Source/cmake/WebKitFS.cmake:
Tools:
Modify CMake ports to use WEBKIT_EXECUTABLE when creating their respective
MiniBrowsers.
* MiniBrowser/gtk/CMakeLists.txt:
* MiniBrowser/win/CMakeLists.txt:
* MiniBrowser/wpe/CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/ChangeLog (259562 => 259563)
--- trunk/ChangeLog 2020-04-06 04:14:17 UTC (rev 259562)
+++ trunk/ChangeLog 2020-04-06 04:22:04 UTC (rev 259563)
@@ -1,5 +1,16 @@
2020-04-05 Don Olmstead <[email protected]>
+ [CMake] Use WEBKIT_EXECUTABLE in MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=206894
+
+ Reviewed by Adrian Perez de Castro.
+
+ Add a MiniBrowser derived sources directory.
+
+ * Source/cmake/WebKitFS.cmake:
+
+2020-04-05 Don Olmstead <[email protected]>
+
[CMake] Add WebKit::WebKit target
https://bugs.webkit.org/show_bug.cgi?id=210033
Modified: trunk/Source/cmake/WebKitFS.cmake (259562 => 259563)
--- trunk/Source/cmake/WebKitFS.cmake 2020-04-06 04:14:17 UTC (rev 259562)
+++ trunk/Source/cmake/WebKitFS.cmake 2020-04-06 04:22:04 UTC (rev 259563)
@@ -47,6 +47,7 @@
set(WebKitLegacy_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
set(WebKit_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
+set(MiniBrowser_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser")
set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
Modified: trunk/Tools/ChangeLog (259562 => 259563)
--- trunk/Tools/ChangeLog 2020-04-06 04:14:17 UTC (rev 259562)
+++ trunk/Tools/ChangeLog 2020-04-06 04:22:04 UTC (rev 259563)
@@ -1,5 +1,19 @@
2020-04-05 Don Olmstead <[email protected]>
+ [CMake] Use WEBKIT_EXECUTABLE in MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=206894
+
+ Reviewed by Adrian Perez de Castro.
+
+ Modify CMake ports to use WEBKIT_EXECUTABLE when creating their respective
+ MiniBrowsers.
+
+ * MiniBrowser/gtk/CMakeLists.txt:
+ * MiniBrowser/win/CMakeLists.txt:
+ * MiniBrowser/wpe/CMakeLists.txt:
+
+2020-04-05 Don Olmstead <[email protected]>
+
[CMake] Add WebKit::WebKit target
https://bugs.webkit.org/show_bug.cgi?id=210033
Modified: trunk/Tools/MiniBrowser/gtk/CMakeLists.txt (259562 => 259563)
--- trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2020-04-06 04:14:17 UTC (rev 259562)
+++ trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2020-04-06 04:22:04 UTC (rev 259563)
@@ -1,27 +1,27 @@
-set(MINIBROWSER_DIR "${TOOLS_DIR}/MiniBrowser/gtk")
-set(DERIVED_SOURCES_MINIBROWSER_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser")
+set(MiniBrowser_DIR "${TOOLS_DIR}/MiniBrowser/gtk")
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_MINIBROWSER_DIR})
+file(MAKE_DIRECTORY ${MiniBrowser_DERIVED_SOURCES_DIR})
set(MiniBrowser_SOURCES
- ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
- ${MINIBROWSER_DIR}/BrowserCellRendererVariant.c
- ${MINIBROWSER_DIR}/BrowserCellRendererVariant.h
- ${MINIBROWSER_DIR}/BrowserDownloadsBar.c
- ${MINIBROWSER_DIR}/BrowserDownloadsBar.h
- ${MINIBROWSER_DIR}/BrowserSearchBar.c
- ${MINIBROWSER_DIR}/BrowserSearchBar.h
- ${MINIBROWSER_DIR}/BrowserSettingsDialog.c
- ${MINIBROWSER_DIR}/BrowserSettingsDialog.h
- ${MINIBROWSER_DIR}/BrowserTab.c
- ${MINIBROWSER_DIR}/BrowserTab.h
- ${MINIBROWSER_DIR}/BrowserWindow.c
- ${MINIBROWSER_DIR}/BrowserWindow.h
- ${MINIBROWSER_DIR}/main.c
+ ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
+ BrowserCellRendererVariant.c
+ BrowserCellRendererVariant.h
+ BrowserDownloadsBar.c
+ BrowserDownloadsBar.h
+ BrowserSearchBar.c
+ BrowserSearchBar.h
+ BrowserSettingsDialog.c
+ BrowserSettingsDialog.h
+ BrowserTab.c
+ BrowserTab.h
+ BrowserWindow.c
+ BrowserWindow.h
+ main.c
)
-set(MiniBrowser_INCLUDE_DIRECTORIES
- ${DERIVED_SOURCES_MINIBROWSER_DIR}
+set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
+ ${CMAKE_BINRARY_DIR}
+ ${MiniBrowser_DERIVED_SOURCES_DIR}
${DERIVED_SOURCES_WEBKIT2GTK_DIR}
${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
${FORWARDING_HEADERS_DIR}
@@ -35,34 +35,35 @@
${GSTREAMER_INCLUDE_DIRS}
)
-set(MiniBrowser_LIBRARIES
+set(MiniBrowser_PRIVATE_LIBRARIES
+ ${GLIB_LIBRARIES}
+ ${GSTREAMER_LIBRARIES}
+ ${GTK3_LIBRARIES}
${_javascript_Core_LIBRARY_NAME}
- WebKit
- ${GTK3_LIBRARIES}
- ${GLIB_LIBRARIES}
${LIBSOUP_LIBRARIES}
- ${GSTREAMER_LIBRARIES}
+ WebKit::WebKit
)
+set(MiniBrowser_DEPENDENCIES
+ NetworkProcess
+ WebProcess
+)
+
add_custom_command(
- OUTPUT ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
- ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
- MAIN_DEPENDENCY ${MINIBROWSER_DIR}/browser-marshal.list
- COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --body > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
- COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --header > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
+ OUTPUT ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
+ ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
+ MAIN_DEPENDENCY ${MiniBrowser_DIR}/browser-marshal.list
+ COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --body > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
+ COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --header > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
VERBATIM)
+set(MiniBrowser_PRIVATE_DEFINITIONS GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
if (DEVELOPER_MODE)
- add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+ list(APPEND MiniBrowser_PRIVATE_DEFINITIONS -DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
endif ()
-add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
-
-include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
-add_executable(MiniBrowser ${MiniBrowser_SOURCES})
-target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
-
+WEBKIT_EXECUTABLE_DECLARE(MiniBrowser)
+WEBKIT_EXECUTABLE(MiniBrowser)
WEBKIT_ADD_TARGET_CXX_FLAGS(MiniBrowser -Wno-unused-parameter)
install(TARGETS MiniBrowser DESTINATION "${LIBEXEC_INSTALL_DIR}")
Modified: trunk/Tools/MiniBrowser/win/CMakeLists.txt (259562 => 259563)
--- trunk/Tools/MiniBrowser/win/CMakeLists.txt 2020-04-06 04:14:17 UTC (rev 259562)
+++ trunk/Tools/MiniBrowser/win/CMakeLists.txt 2020-04-06 04:22:04 UTC (rev 259563)
@@ -1,5 +1,5 @@
-set(MiniBrowser_INCLUDE_DIRECTORIES
- ${PAL_FRAMEWORK_HEADERS_DIR}
+set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
+ ${CMAKE_BINARY_DIR}
${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
)
@@ -12,23 +12,22 @@
stdafx.cpp
)
-set(MiniBrowser_LIBRARIES
- DbgHelp
+set(MiniBrowser_PRIVATE_DEFINITIONS _UNICODE)
+set(MiniBrowser_PRIVATE_LIBRARIES
WebKit::WTF
comctl32
- comsupp
- comsuppw
shlwapi
+ user32
)
if (USE_CF)
- list(APPEND MiniBrowser_LIBRARIES
+ list(APPEND MiniBrowser_PRIVATE_LIBRARIES
${COREFOUNDATION_LIBRARY}
)
endif ()
if (ENABLE_WEBKIT_LEGACY)
- add_definitions(-DENABLE_WEBKIT_LEGACY)
+ list(APPEND MiniBrowser_PRIVATE_DEFINITIONS ENABLE_WEBKIT_LEGACY)
list(APPEND MiniBrowser_INCLUDE_DIRECTORIES
${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
)
@@ -40,7 +39,7 @@
WebDownloadDelegate.cpp
WebKitLegacyBrowserWindow.cpp
)
- list(APPEND MiniBrowser_LIBRARIES
+ list(APPEND MiniBrowser_PRIVATE_LIBRARIES
WebKitLegacy
WebKitLegacyGUID
)
@@ -47,32 +46,23 @@
endif ()
if (ENABLE_WEBKIT)
- add_definitions(-DENABLE_WEBKIT)
- list(APPEND MiniBrowser_INCLUDE_DIRECTORIES
- ${WebKit_FRAMEWORK_HEADERS_DIR}
- ${WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR}
- )
+ list(APPEND MiniBrowser_PRIVATE_DEFINITIONS ENABLE_WEBKIT)
list(APPEND MiniBrowser_SOURCES
WebKitBrowserWindow.cpp
)
- list(APPEND MiniBrowser_LIBRARIES
+ list(APPEND MiniBrowser_PRIVATE_LIBRARIES
WebKit::WebKit
)
endif ()
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_RUNTIME_LINKER_FLAGS}")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup")
+WEBKIT_EXECUTABLE_DECLARE(MiniBrowser)
+WEBKIT_WRAP_EXECUTABLE(MiniBrowser
+ SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp MiniBrowser.rc
+ LIBRARIES shlwapi
+)
+WEBKIT_EXECUTABLE(MiniBrowser)
+set_target_properties(MiniBrowser PROPERTIES WIN32_EXECUTABLE ON)
if (${WTF_PLATFORM_WIN_CAIRO})
- add_definitions(-DWIN_CAIRO)
+ target_compile_definitions(MiniBrowser PRIVATE WIN_CAIRO)
endif ()
-add_definitions(-D_UNICODE)
-include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
-add_library(MiniBrowserLib SHARED ${MiniBrowser_SOURCES})
-target_link_libraries(MiniBrowserLib ${MiniBrowser_LIBRARIES})
-
-add_executable(MiniBrowser WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp MiniBrowser.rc)
-target_link_libraries(MiniBrowser shlwapi)
-set_target_properties(MiniBrowser PROPERTIES OUTPUT_NAME "MiniBrowser")
-
-add_dependencies(MiniBrowser MiniBrowserLib)
Modified: trunk/Tools/MiniBrowser/wpe/CMakeLists.txt (259562 => 259563)
--- trunk/Tools/MiniBrowser/wpe/CMakeLists.txt 2020-04-06 04:14:17 UTC (rev 259562)
+++ trunk/Tools/MiniBrowser/wpe/CMakeLists.txt 2020-04-06 04:22:04 UTC (rev 259563)
@@ -1,10 +1,9 @@
-set(MINIBROWSER_DIR "${TOOLS_DIR}/MiniBrowser/wpe")
-
set(MiniBrowser_SOURCES
- ${MINIBROWSER_DIR}/main.cpp
+ main.cpp
)
-set(MiniBrowser_INCLUDE_DIRECTORIES
+set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
+ ${CMAKE_BINARY_DIR}
${TOOLS_DIR}/wpe/backends/
${DERIVED_SOURCES_WPE_API_DIR}
${FORWARDING_HEADERS_WPE_DIR}
@@ -16,23 +15,21 @@
${WPEBACKEND_FDO_INCLUDE_DIRS}
)
-set(MiniBrowser_LIBRARIES
- WPE::libwpe
- WPEToolingBackends
- WebKit
+set(MiniBrowser_PRIVATE_LIBRARIES
${ATK_LIBRARIES}
${_javascript_Core_LIBRARY_NAME}
${WPEBACKEND_FDO_LIBRARIES}
+ WPE::libwpe
+ WPEToolingBackends
+ WebKit::WebKit
)
if (DEVELOPER_MODE)
- add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+ list(APPEND MiniBrowser_PRIVATE_DEFINITIONS WEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
endif ()
-include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
-add_executable(MiniBrowser ${MiniBrowser_SOURCES})
-target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
+WEBKIT_EXECUTABLE_DECLARE(MiniBrowser)
+WEBKIT_EXECUTABLE(MiniBrowser)
install(TARGETS MiniBrowser DESTINATION "${LIBEXEC_INSTALL_DIR}")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
