Changeset 183545 in webkit

Timestamp:

Apr 29, 2015 7:34:53 AM (9 years ago)

Author:

ryuan.choi@navercorp.com

Message:

[EFL] Build failure to find gio-unix
​https://bugs.webkit.org/show_bug.cgi?id=144083

Reviewed by Gyuyoung Kim.

Original patch by Doug Newgard <​scimma22@outlook.com>

• Source/cmake/OptionsEfl.cmake: Moved geoclue block before find_package(GLIB...)

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsEfl.cmake (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2015-04-29  Ryuan Choi  <ryuan.choi@navercorp.com>
+
+        [EFL] Build failure to find gio-unix
+        https://bugs.webkit.org/show_bug.cgi?id=144083
+
+        Reviewed by Gyuyoung Kim.
+
+        Original patch by Doug Newgard <scimma22@outlook.com>
+
+        * Source/cmake/OptionsEfl.cmake: Moved geoclue block before find_package(GLIB...)
+
 2015-04-28  Ryuan Choi  <ryuan.choi@navercorp.com>
 

trunk/Source/cmake/OptionsEfl.cmake

@@ -170 +170 @@
 find_package(Evas ${EFL_REQUIRED_VERSION} REQUIRED CONFIG)
 
-find_package(Freetype2 2.4.2 REQUIRED)
-find_package(GLIB 2.38.0 REQUIRED COMPONENTS ${GLIB_COMPONENTS})
-find_package(HarfBuzz 0.9.2 REQUIRED)
-find_package(LibSoup 2.42.0 REQUIRED)
-
-if (ENABLE_BATTERY_STATUS)
-    find_package(Eldbus ${EFL_REQUIRED_VERSION} CONFIG)
-endif ()
-
 if (ENABLE_GEOLOCATION)
     list(APPEND GLIB_COMPONENTS gio-unix)
@@ -188 +179 @@
       set(WTF_USE_GEOCLUE2 0)
     endif ()
+endif ()
+
+find_package(Freetype2 2.4.2 REQUIRED)
+find_package(GLIB 2.38.0 REQUIRED COMPONENTS ${GLIB_COMPONENTS})
+find_package(HarfBuzz 0.9.2 REQUIRED)
+find_package(LibSoup 2.42.0 REQUIRED)
+
+if (ENABLE_BATTERY_STATUS)
+    find_package(Eldbus ${EFL_REQUIRED_VERSION} CONFIG)
 endif ()