[GTK][CMake] Extra include directory when libnotify is present but disabled
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 May 2015 19:56:30 +0000 (19:56 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 May 2015 19:56:30 +0000 (19:56 +0000)
https://bugs.webkit.org/show_bug.cgi?id=144941

Reviewed by Martin Robinson.

Add LIBNOTIFY_INCLUDE_DIRS to WebKit2_INCLUDE_DIRECTORIES only if USE_LIBNOTIFY is true,
rather than checking LIBNOTIFY_FOUND.

* PlatformGTK.cmake:

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

Source/WebKit2/ChangeLog
Source/WebKit2/PlatformGTK.cmake

index 9b9e23a..6f12579 100644 (file)
@@ -1,3 +1,15 @@
+2015-05-13  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [GTK][CMake] Extra include directory when libnotify is present but disabled
+        https://bugs.webkit.org/show_bug.cgi?id=144941
+
+        Reviewed by Martin Robinson.
+
+        Add LIBNOTIFY_INCLUDE_DIRS to WebKit2_INCLUDE_DIRECTORIES only if USE_LIBNOTIFY is true,
+        rather than checking LIBNOTIFY_FOUND.
+
+        * PlatformGTK.cmake:
+
 2015-05-13  Beth Dakin  <bdakin@apple.com>
 
         Need SPI to set the overlay scroll bar style
index 79b42b2..d0593fd 100644 (file)
@@ -494,7 +494,7 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
     ${LIBSOUP_INCLUDE_DIRS}
 )
 
-if (LIBNOTIFY_FOUND)
+if (USE_LIBNOTIFY)
 list(APPEND WebKit2_INCLUDE_DIRECTORIES
     ${LIBNOTIFY_INCLUDE_DIRS}
 )