Diff
Modified: trunk/ChangeLog (161921 => 161922)
--- trunk/ChangeLog 2014-01-14 00:42:25 UTC (rev 161921)
+++ trunk/ChangeLog 2014-01-14 00:43:32 UTC (rev 161922)
@@ -1,5 +1,21 @@
2014-01-13 Martin Robinson <mrobin...@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 <mrobin...@igalia.com>
+
[GTK][CMake] Add a 'check' target
https://bugs.webkit.org/show_bug.cgi?id=126770
Modified: trunk/Source/WebKit2/CMakeLists.txt (161921 => 161922)
--- trunk/Source/WebKit2/CMakeLists.txt 2014-01-14 00:42:25 UTC (rev 161921)
+++ trunk/Source/WebKit2/CMakeLists.txt 2014-01-14 00:43:32 UTC (rev 161922)
@@ -676,6 +676,7 @@
# 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 ()
Modified: trunk/Source/WebKit2/ChangeLog (161921 => 161922)
--- trunk/Source/WebKit2/ChangeLog 2014-01-14 00:42:25 UTC (rev 161921)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-14 00:43:32 UTC (rev 161922)
@@ -1,5 +1,14 @@
2014-01-13 Martin Robinson <mrobin...@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 <mrobin...@igalia.com>
+
[GTK][CMake] Circular dependency in generation of WebKitEnumTypes.h
https://bugs.webkit.org/show_bug.cgi?id=126912
Modified: trunk/Source/cmake/FindATK.cmake (161921 => 161922)
--- trunk/Source/cmake/FindATK.cmake 2014-01-14 00:42:25 UTC (rev 161921)
+++ trunk/Source/cmake/FindATK.cmake 2014-01-14 00:43:32 UTC (rev 161922)
@@ -46,3 +46,7 @@
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
+)
Modified: trunk/Source/cmake/FindCairo.cmake (161921 => 161922)
--- trunk/Source/cmake/FindCairo.cmake 2014-01-14 00:42:25 UTC (rev 161921)
+++ trunk/Source/cmake/FindCairo.cmake 2014-01-14 00:43:32 UTC (rev 161922)
@@ -68,3 +68,8 @@
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
+)
Modified: trunk/Source/cmake/FindEGL.cmake (161921 => 161922)
--- trunk/Source/cmake/FindEGL.cmake 2014-01-14 00:42:25 UTC (rev 161921)
+++ trunk/Source/cmake/FindEGL.cmake 2014-01-14 00:43:32 UTC (rev 161922)
@@ -36,6 +36,6 @@
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 ()
Modified: trunk/Source/cmake/FindEnchant.cmake (161921 => 161922)
--- trunk/Source/cmake/FindEnchant.cmake 2014-01-14 00:42:25 UTC (rev 161921)
+++ trunk/Source/cmake/FindEnchant.cmake 2014-01-14 00:43:32 UTC (rev 161922)
@@ -41,3 +41,8 @@
PATHS ${PC_ENCHANT_LIBDIR}
${PC_ENCHANT_LIBRARY_DIRS}
)
+
+mark_as_advanced(
+ ENCHANT_INCLUDE_DIRS
+ ENCHANT_LIBRARIES
+)
Modified: trunk/Source/cmake/FindGLIB.cmake (161921 => 161922)
--- trunk/Source/cmake/FindGLIB.cmake 2014-01-14 00:42:25 UTC (rev 161921)
+++ trunk/Source/cmake/FindGLIB.cmake 2014-01-14 00:43:32 UTC (rev 161922)
@@ -105,3 +105,15 @@
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
+)
Modified: trunk/Source/cmake/FindGStreamer.cmake (161921 => 161922)
--- trunk/Source/cmake/FindGStreamer.cmake 2014-01-14 00:42:25 UTC (rev 161921)
+++ trunk/Source/cmake/FindGStreamer.cmake 2014-01-14 00:43:32 UTC (rev 161922)
@@ -122,3 +122,20 @@
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
+)
Modified: trunk/Source/cmake/FindHarfBuzz.cmake (161921 => 161922)
--- trunk/Source/cmake/FindHarfBuzz.cmake 2014-01-14 00:42:25 UTC (rev 161921)
+++ trunk/Source/cmake/FindHarfBuzz.cmake 2014-01-14 00:43:32 UTC (rev 161922)
@@ -53,3 +53,8 @@
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES)
+
+mark_as_advanced(
+ HARFBUZZ_INCLUDE_DIRS
+ HARFBUZZ_LIBRARIES
+)
Modified: trunk/Source/cmake/FindLibSoup.cmake (161921 => 161922)
--- trunk/Source/cmake/FindLibSoup.cmake 2014-01-14 00:42:25 UTC (rev 161921)
+++ trunk/Source/cmake/FindLibSoup.cmake 2014-01-14 00:43:32 UTC (rev 161922)
@@ -50,3 +50,8 @@
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
+)
