Title: [160805] trunk/Tools
- Revision
- 160805
- Author
- [email protected]
- Date
- 2013-12-18 16:10:15 -0800 (Wed, 18 Dec 2013)
Log Message
[GTK] [CMake] Add support for building GtkLauncher
https://bugs.webkit.org/show_bug.cgi?id=125766
Reviewed by Gustavo Noronha Silva.
* CMakeLists.txt: Add the GtkLauncher subdirectory for the GTK port.
* GtkLauncher/CMakeLists.txt: Added.
* GtkLauncher/main.c: Support including the CMake config file.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/CMakeLists.txt (160804 => 160805)
--- trunk/Tools/CMakeLists.txt 2013-12-19 00:04:47 UTC (rev 160804)
+++ trunk/Tools/CMakeLists.txt 2013-12-19 00:10:15 UTC (rev 160805)
@@ -19,6 +19,9 @@
if (ENABLE_WEBKIT2)
add_subdirectory(MiniBrowser/gtk)
endif ()
+ if (ENABLE_WEBKIT)
+ add_subdirectory(GtkLauncher)
+ endif ()
elseif ("${PORT}" STREQUAL "WinCE")
add_subdirectory(WinCELauncher)
endif ()
Modified: trunk/Tools/ChangeLog (160804 => 160805)
--- trunk/Tools/ChangeLog 2013-12-19 00:04:47 UTC (rev 160804)
+++ trunk/Tools/ChangeLog 2013-12-19 00:10:15 UTC (rev 160805)
@@ -1,3 +1,14 @@
+2013-12-18 Martin Robinson <[email protected]>
+
+ [GTK] [CMake] Add support for building GtkLauncher
+ https://bugs.webkit.org/show_bug.cgi?id=125766
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * CMakeLists.txt: Add the GtkLauncher subdirectory for the GTK port.
+ * GtkLauncher/CMakeLists.txt: Added.
+ * GtkLauncher/main.c: Support including the CMake config file.
+
2013-12-18 Alex Christensen <[email protected]>
[WinCairo] Preparation for GStreamer on Windows.
Added: trunk/Tools/GtkLauncher/CMakeLists.txt (0 => 160805)
--- trunk/Tools/GtkLauncher/CMakeLists.txt (rev 0)
+++ trunk/Tools/GtkLauncher/CMakeLists.txt 2013-12-19 00:10:15 UTC (rev 160805)
@@ -0,0 +1,28 @@
+add_definitions(-DWEBKIT_EXEC_PATH="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_SOURCE_DIR}/Source
+ ${CMAKE_SOURCE_DIR}/Source/_javascript_Core/ForwardingHeaders
+ ${CMAKE_SOURCE_DIR}/Source/WebKit/gtk
+ ${DERIVED_SOURCES_DIR}
+ ${DERIVED_SOURCES_DIR}/webkit
+ ${GLIB_INCLUDE_DIRS}
+ ${GTK3_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
+)
+
+add_executable(GtkLauncher
+ LauncherInspectorWindow.c
+ LauncherInspectorWindow.h
+ main.c
+)
+
+target_link_libraries(GtkLauncher
+ ${_javascript_Core_LIBRARY_NAME}
+ WebKit
+ ${GLIB_LIBRARIES}
+ ${GTK3_LIBRARIES}
+ ${LIBSOUP_LIBRARIES}
+)
+
Property changes on: trunk/Tools/GtkLauncher/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/Tools/GtkLauncher/main.c (160804 => 160805)
--- trunk/Tools/GtkLauncher/main.c 2013-12-19 00:04:47 UTC (rev 160804)
+++ trunk/Tools/GtkLauncher/main.c 2013-12-19 00:10:15 UTC (rev 160805)
@@ -25,7 +25,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+#ifdef BUILDING_WITH_CMAKE
+#include "cmakeconfig.h"
+#else
#include "autotoolsconfig.h"
+#endif
+#endif
+
#include "LauncherInspectorWindow.h"
#include <errno.h>
#include <gdk/gdkkeysyms.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
