[CMake] Mark all dependency include paths and libraries as advanced variables
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Jan 2014 00:43:32 +0000 (00:43 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Jan 2014 00:43:32 +0000 (00:43 +0000)
https://bugs.webkit.org/show_bug.cgi?id=126504

Reviewed by Daniel Bates.

.:

* Source/cmake/FindATK.cmake: Mark result variable as advanced.
* Source/cmake/FindCairo.cmake: Ditto.
* Source/cmake/FindEGL.cmake: Ditto.
* Source/cmake/FindEnchant.cmake: Ditto.
* Source/cmake/FindGLIB.cmake: Ditto.
* Source/cmake/FindGStreamer.cmake: Ditto.
* Source/cmake/FindHarfBuzz.cmake: Ditto.
* Source/cmake/FindLibSoup.cmake: Ditto.

Source/WebKit2:

* CMakeLists.txt: Mark the LIBRT_LIBRARIES variable as advanced.

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

ChangeLog
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/cmake/FindATK.cmake
Source/cmake/FindCairo.cmake
Source/cmake/FindEGL.cmake
Source/cmake/FindEnchant.cmake
Source/cmake/FindGLIB.cmake
Source/cmake/FindGStreamer.cmake
Source/cmake/FindHarfBuzz.cmake
Source/cmake/FindLibSoup.cmake

index 5d093cf..313c345 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2014-01-13  Martin Robinson  <mrobinson@igalia.com>
 
+        [CMake] Mark all dependency include paths and libraries as advanced variables
+        https://bugs.webkit.org/show_bug.cgi?id=126504
+
+        Reviewed by Daniel Bates.
+
+        * Source/cmake/FindATK.cmake: Mark result variable as advanced.
+        * Source/cmake/FindCairo.cmake: Ditto.
+        * Source/cmake/FindEGL.cmake: Ditto.
+        * Source/cmake/FindEnchant.cmake: Ditto.
+        * Source/cmake/FindGLIB.cmake: Ditto.
+        * Source/cmake/FindGStreamer.cmake: Ditto.
+        * Source/cmake/FindHarfBuzz.cmake: Ditto.
+        * Source/cmake/FindLibSoup.cmake: Ditto.
+
+2014-01-13  Martin Robinson  <mrobinson@igalia.com>
+
         [GTK][CMake] Add a 'check' target
         https://bugs.webkit.org/show_bug.cgi?id=126770
 
index 2a78124..e33d929 100644 (file)
@@ -676,6 +676,7 @@ set(WebKit2_LIBRARIES
 
 # librt is needed for shm_open on Linux.
 find_library(LIBRT_LIBRARIES NAMES rt)
+mark_as_advanced(LIBRT_LIBRARIES)
 if (LIBRT_LIBRARIES)
     list(APPEND WebKit2_LIBRARIES ${LIBRT_LIBRARIES})
 endif ()
index fc8f060..3cc50a5 100644 (file)
@@ -1,5 +1,14 @@
 2014-01-13  Martin Robinson  <mrobinson@igalia.com>
 
+        [CMake] Mark all dependency include paths and libraries as advanced variables
+        https://bugs.webkit.org/show_bug.cgi?id=126504
+
+        Reviewed by Daniel Bates.
+
+        * CMakeLists.txt: Mark the LIBRT_LIBRARIES variable as advanced.
+
+2014-01-13  Martin Robinson  <mrobinson@igalia.com>
+
         [GTK][CMake] Circular dependency in generation of WebKitEnumTypes.h
         https://bugs.webkit.org/show_bug.cgi?id=126912
 
index c895406..d49ab27 100644 (file)
@@ -46,3 +46,7 @@ find_library(ATK_LIBRARIES
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ATK REQUIRED_VARS ATK_INCLUDE_DIRS ATK_LIBRARIES
                                       VERSION_VAR   PC_ATK_VERSION)
+mark_as_advanced(
+    ATK_INCLUDE_DIRS
+    ATK_LIBRARIES
+)
index 0a2dbd6..d0130ad 100644 (file)
@@ -68,3 +68,8 @@ endif ()
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cairo REQUIRED_VARS CAIRO_INCLUDE_DIRS CAIRO_LIBRARIES
                                         VERSION_VAR CAIRO_VERSION)
+
+mark_as_advanced(
+    CAIRO_INCLUDE_DIRS
+    CAIRO_LIBRARIES
+)
index 163ecb3..eb90717 100644 (file)
@@ -36,6 +36,6 @@ find_library(EGL_LIBRARY NAMES ${EGL_NAMES})
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(EGL DEFAULT_MSG EGL_INCLUDE_DIR EGL_LIBRARY)
 
-if (PORT STREQUAL "Nix")
+if (PORT STREQUAL "Nix" OR PORT STREQUAL "GTK")
    mark_as_advanced(EGL_INCLUDE_DIR EGL_LIBRARY)
 endif ()
index 929979e..8dd0b5b 100644 (file)
@@ -41,3 +41,8 @@ find_library(ENCHANT_LIBRARIES
     PATHS ${PC_ENCHANT_LIBDIR}
           ${PC_ENCHANT_LIBRARY_DIRS}
 )
+
+mark_as_advanced(
+    ENCHANT_INCLUDE_DIRS
+    ENCHANT_LIBRARIES
+)
index e91e5ae..c47aeeb 100644 (file)
@@ -105,3 +105,15 @@ endforeach ()
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLIB REQUIRED_VARS GLIB_INCLUDE_DIRS GLIB_LIBRARIES ${ADDITIONAL_REQUIRED_VARS}
                                        VERSION_VAR   GLIB_VERSION)
+
+mark_as_advanced(
+    GLIBCONFIG_INCLUDE_DIR
+    GLIB_GIO_LIBRARIES
+    GLIB_GIO_UNIX_LIBRARIES
+    GLIB_GMODULE_LIBRARIES
+    GLIB_GOBJECT_LIBRARIES
+    GLIB_GTHREAD_LIBRARIES
+    GLIB_INCLUDE_DIR
+    GLIB_INCLUDE_DIRS
+    GLIB_LIBRARIES
+)
index b9dd0bb..8930bd7 100644 (file)
@@ -122,3 +122,20 @@ endforeach ()
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer REQUIRED_VARS _GSTREAMER_REQUIRED_VARS
                                             VERSION_VAR   GSTREAMER_VERSION)
+
+mark_as_advanced(
+    GSTREAMER_APP_INCLUDE_DIRS
+    GSTREAMER_APP_LIBRARIES
+    GSTREAMER_AUDIO_INCLUDE_DIRS
+    GSTREAMER_AUDIO_LIBRARIES
+    GSTREAMER_BASE_INCLUDE_DIRS
+    GSTREAMER_BASE_LIBRARIES
+    GSTREAMER_FFT_INCLUDE_DIRS
+    GSTREAMER_FFT_LIBRARIES
+    GSTREAMER_INCLUDE_DIRS
+    GSTREAMER_LIBRARIES
+    GSTREAMER_PBUTILS_INCLUDE_DIRS
+    GSTREAMER_PBUTILS_LIBRARIES
+    GSTREAMER_VIDEO_INCLUDE_DIRS
+    GSTREAMER_VIDEO_LIBRARIES
+)
index 2929900..bc702c4 100644 (file)
@@ -53,3 +53,8 @@ endif ()
 
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES)
+
+mark_as_advanced(
+    HARFBUZZ_INCLUDE_DIRS
+    HARFBUZZ_LIBRARIES
+)
index aaa76e8..b76b66b 100644 (file)
@@ -50,3 +50,8 @@ find_library(LIBSOUP_LIBRARIES
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibSoup REQUIRED_VARS LIBSOUP_INCLUDE_DIRS LIBSOUP_LIBRARIES
                                           VERSION_VAR   PC_LIBSOUP_VERSION)
+
+mark_as_advanced(
+    LIBSOUP_INCLUDE_DIRS
+    LIBSOUP_LIBRARIES
+)