Changeset 207668 in webkit

Timestamp:

Oct 21, 2016 6:27:10 AM (8 years ago)

Author:

Csaba Osztrogonác

Message:

[EFL] REGRESSION(r207616): Build is broken due to missing libgeoclue-dev package
​https://bugs.webkit.org/show_bug.cgi?id=163733

Reviewed by Gyuyoung Kim.

.:

• Source/cmake/OptionsEfl.cmake: Expose USE_GEOCLUE2 to the build properly.

Tools:

• efl/install-dependencies: Added geoclue-2.0 package.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsEfl.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/efl/install-dependencies (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2016-10-21  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [EFL] REGRESSION(r207616): Build is broken due to missing libgeoclue-dev package
+        https://bugs.webkit.org/show_bug.cgi?id=163733
+
+        Reviewed by Gyuyoung Kim.
+
+        * Source/cmake/OptionsEfl.cmake: Expose USE_GEOCLUE2 to the build properly.
+
 2016-10-21  Adam Bergkvist  <adam.bergkvist@ericsson.com>
 

trunk/Source/cmake/OptionsEfl.cmake

@@ -187 +187 @@
     find_package(GeoClue2 2.1.5)
     if (GEOCLUE2_FOUND)
-      set(USE_GEOCLUE2 1)
+        SET_AND_EXPOSE_TO_BUILD(USE_GEOCLUE2 ${GEOCLUE2_FOUND})
     else ()
-      find_package(GeoClue)
-      set(USE_GEOCLUE2 0)
+        find_package(GeoClue)
+        if (NOT GEOCLUE_FOUND)
+            message(FATAL_ERROR "Geoclue is needed for ENABLE_GEOLOCATION.")
+        endif ()
     endif ()
 endif ()

trunk/Tools/ChangeLog

@@ +1 @@
+2016-10-21  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [EFL] REGRESSION(r207616): Build is broken due to missing libgeoclue-dev package
+        https://bugs.webkit.org/show_bug.cgi?id=163733
+
+        Reviewed by Gyuyoung Kim.
+
+        * efl/install-dependencies: Added geoclue-2.0 package.
+
 2016-10-21  Commit Queue  <commit-queue@webkit.org>
 

trunk/Tools/efl/install-dependencies

@@ -67 +67 @@
         flex \
         g++ \
+        geoclue-2.0 \
         gperf \
         gtk-doc-tools \