Fix more CMake GTK+ build issues after r150336
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 29 May 2013 19:24:05 +0000 (19:24 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 29 May 2013 19:24:05 +0000 (19:24 +0000)
.:

* Source/cmake/OptionsGTK.cmake: Actually set the new output name variable
and be sure to set WTF_USE_EGL when EGL is enabled.

Source/WebKit2:

* CMakeLists.txt: We need to allow for setting the WebProcess output name, since
WebKitGTK+ expects it to be called WebKitWebProcess.
* PlatformGTK.cmake: No longer set WebProcess_EXECUTABLE_NAME as it's been replaced
by WebKit2_WebProcess_OUTPUT_NAME.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@150921 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/PlatformGTK.cmake
Source/cmake/OptionsGTK.cmake

index 1dd37c2..bc33e15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-05-29  Martin Robinson  <mrobinson@igalia.com>
+
+        Fix more CMake GTK+ build issues after r150336
+
+        * Source/cmake/OptionsGTK.cmake: Actually set the new output name variable
+        and be sure to set WTF_USE_EGL when EGL is enabled.
+
 2013-05-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Update NEWS and Versions.m4 for 2.1.1 release.
 2013-05-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Update NEWS and Versions.m4 for 2.1.1 release.
index 60a4efd..3f88a83 100644 (file)
@@ -643,6 +643,10 @@ add_executable(WebProcess ${WebProcess_SOURCES})
 target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
 set_target_properties(WebProcess PROPERTIES FOLDER "WebKit")
 
 target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
 set_target_properties(WebProcess PROPERTIES FOLDER "WebKit")
 
+if (WebKit2_WebProcess_OUTPUT_NAME)
+    set_target_properties(WebProcess PROPERTIES OUTPUT_NAME ${WebKit2_WebProcess_OUTPUT_NAME})
+endif ()
+
 set_target_properties(WebKit2 PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
 
 install(TARGETS WebKit2 DESTINATION "${LIB_INSTALL_DIR}")
 set_target_properties(WebKit2 PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
 
 install(TARGETS WebKit2 DESTINATION "${LIB_INSTALL_DIR}")
index 253cafe..eefb942 100644 (file)
@@ -1,3 +1,12 @@
+2013-05-29  Martin Robinson  <mrobinson@igalia.com>
+
+        Fix more CMake GTK+ build issues after r150336
+
+        * CMakeLists.txt: We need to allow for setting the WebProcess output name, since
+        WebKitGTK+ expects it to be called WebKitWebProcess.
+        * PlatformGTK.cmake: No longer set WebProcess_EXECUTABLE_NAME as it's been replaced
+        by WebKit2_WebProcess_OUTPUT_NAME.
+
 2013-05-29  Marcelo Lira  <marcelo.lira@openbossa.org>
 
         [WK2][CoordinatedGraphics][EFL] WKViewUserViewportToContents() function doesn't do what it says
 2013-05-29  Marcelo Lira  <marcelo.lira@openbossa.org>
 
         [WK2][CoordinatedGraphics][EFL] WKViewUserViewportToContents() function doesn't do what it says
index ef3af11..e363879 100644 (file)
@@ -1,4 +1,3 @@
-set(WebProcess_EXECUTABLE_NAME WebKitWebProcess)
 set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
 set(WEBKIT2_BUILT_API_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/webkit2)
 set(WEBKIT2_FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders/webkit2gtk)
 set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
 set(WEBKIT2_BUILT_API_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/webkit2)
 set(WEBKIT2_FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders/webkit2gtk)
index df66d9a..62165af 100644 (file)
@@ -83,6 +83,7 @@ set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk)
 set(WebCore_OUTPUT_NAME WebCoreGTK)
 set(WebKit_OUTPUT_NAME webkitgtk-3.0)
 set(WebKit2_OUTPUT_NAME webkit2gtk-3.0)
 set(WebCore_OUTPUT_NAME WebCoreGTK)
 set(WebKit_OUTPUT_NAME webkitgtk-3.0)
 set(WebKit2_OUTPUT_NAME webkit2gtk-3.0)
+set(WebKit2_WebProcess_OUTPUT_NAME WebKitWebProcess)
 set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
 
 set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
 set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
 
 set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
@@ -126,6 +127,10 @@ find_package(OpenGL)
 check_include_files("GL/glx.h" GLX_FOUND)
 find_package(EGL)
 
 check_include_files("GL/glx.h" GLX_FOUND)
 find_package(EGL)
 
+if (EGL_FOUND)
+    set(WTF_USE_EGL 1)
+endif ()
+
 if (ENABLE_SPELLCHECK)
     find_package(Enchant REQUIRED)
 endif ()
 if (ENABLE_SPELLCHECK)
     find_package(Enchant REQUIRED)
 endif ()