Changeset 62663 in webkit

Timestamp:

Jul 7, 2010 7:23:50 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-07 Rafael Antognolli <​antognolli@profusion.mobi>

Reviewed by Adam Barth.

[EFL] Fix cmake build and libsoup detection
Some changes should be done to cmake build system to fix the detection of libsoup and correct some link paths:

• LINK_FLAGS should be set using quotes, otherwise some wrong substitution takes place;
• we should use LIBSOUP24_* instead of LIBSOUP_* since this is the version we are using;
• need to set HAVE_LIBSOUP_2_29_90 if we find a version equal or newer than that. ​https://bugs.webkit.org/show_bug.cgi?id=41717

• cmake/OptionsEfl.cmake:

2010-07-07 Rafael Antognolli <​antognolli@profusion.mobi>

Reviewed by Adam Barth.

[EFL] Fix cmake build and libsoup detection
Some changes should be done to cmake build system to fix the detection of libsoup and correct some link paths:

• LINK_FLAGS should be set using quotes, otherwise some wrong substitution takes place;
• we should use LIBSOUP24_* instead of LIBSOUP_* since this is the version we are using;
• need to set HAVE_LIBSOUP_2_29_90 if we find a version equal or newer than that. ​https://bugs.webkit.org/show_bug.cgi?id=41717

• CMakeLists.txt:
• CMakeListsEfl.txt:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• WebKit/CMakeLists.txt (modified) (1 diff)
• WebKit/CMakeListsEfl.txt (modified) (4 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• cmake/OptionsEfl.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2010-07-07  Rafael Antognolli  <antognolli@profusion.mobi>
+
+        Reviewed by Adam Barth.
+
+        [EFL] Fix cmake build and libsoup detection
+        Some changes should be done to cmake build system to fix the detection of libsoup and correct some link paths:
+        - LINK_FLAGS should be set using quotes, otherwise some wrong
+        substitution takes place;
+        - we should use LIBSOUP24_* instead of LIBSOUP_* since this is the
+        version we are using;
+        - need to set HAVE_LIBSOUP_2_29_90 if we find a version equal or newer
+        than that.
+        https://bugs.webkit.org/show_bug.cgi?id=41717
+
+        * cmake/OptionsEfl.cmake:
+
 2010-07-06  Leandro Pereira  <leandro@profusion.mobi>
 

trunk/WebKit/CMakeLists.txt

@@ -58 +58 @@
 ADD_LIBRARY(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
 TARGET_LINK_LIBRARIES(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARIES})
-ADD_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} LINK_FLAGS ${WebKit_LINK_FLAGS})
+ADD_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} LINK_FLAGS "${WebKit_LINK_FLAGS}")
 
 INSTALL(TARGETS ${WebKit_LIBRARY_NAME} DESTINATION lib)

trunk/WebKit/CMakeListsEfl.txt

@@ -18 +18 @@
     ${Gdk_INCLUDE_DIRS}
     ${Glib_INCLUDE_DIRS}
-    ${LIBSOUP2_INCLUDE_DIRS}
+    ${LIBSOUP24_INCLUDE_DIRS}
     ${LIBXML2_INCLUDE_DIRS}
     ${LIBXSLT_INCLUDE_DIRS}
@@ -51 +51 @@
     ${Glib_LIBRARIES}
     ${Gtk_LIBRARIES}
-    ${LIBSOUP_LIBRARIES}
+    ${LIBSOUP24_LIBRARIES}
     ${LIBXML2_LIBRARIES}
     ${Pango_LIBRARIES}
@@ -80 +80 @@
     ${Gdk_LIBRARIES}
     ${Glib_LIBRARIES}
-    ${LIBSOUP2_LIBRARIES}
+    ${LIBSOUP24_LIBRARIES}
     ${LIBXML2_LIBRARIES}
     ${LIBXSLT_LIBRARIES}
@@ -95 +95 @@
 ADD_EXECUTABLE(../Programs/EWebLauncher ${EWebLauncher_SOURCES})
 TARGET_LINK_LIBRARIES(../Programs/EWebLauncher ${EWebLauncher_LIBRARIES})
-ADD_TARGET_PROPERTIES(../Programs/EWebLauncher LINK_FLAGS ${EWebLauncher_LINK_FLAGS})
+ADD_TARGET_PROPERTIES(../Programs/EWebLauncher LINK_FLAGS "${EWebLauncher_LINK_FLAGS}")
 
 IF (SHARED_CORE)

trunk/WebKit/ChangeLog

@@ +1 @@
+2010-07-07  Rafael Antognolli  <antognolli@profusion.mobi>
+
+        Reviewed by Adam Barth.
+
+        [EFL] Fix cmake build and libsoup detection
+        Some changes should be done to cmake build system to fix the detection of libsoup and correct some link paths:
+        - LINK_FLAGS should be set using quotes, otherwise some wrong
+        substitution takes place;
+        - we should use LIBSOUP24_* instead of LIBSOUP_* since this is the
+        version we are using;
+        - need to set HAVE_LIBSOUP_2_29_90 if we find a version equal or newer
+        than that.
+        https://bugs.webkit.org/show_bug.cgi?id=41717
+
+        * CMakeLists.txt:
+        * CMakeListsEfl.txt:
+
 2010-07-05  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/cmake/OptionsEfl.cmake

@@ -35 +35 @@
 SET(WTF_USE_SOUP 1)
 ADD_DEFINITIONS(-DWTF_USE_SOUP=1)
-IF (LIBSOUP_VERSION VERSION_LESS 2.29.90)
-ELSE (LIBSOUP_VERSION VERSION_LESS 2.29.90)
+IF (LIBSOUP24_VERSION VERSION_LESS 2.29.90)
+ELSE (LIBSOUP24_VERSION VERSION_LESS 2.29.90)
     SET(HAVE_LIBSOUP_2_29_90 1)
+    ADD_DEFINITIONS(-DHAVE_LIBSOUP_2_29_90=1)
 ENDIF ()