Commit 3770244d authored by mrobinson@webkit.org's avatar mrobinson@webkit.org

[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.

Source/WebKit2:

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

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@161922 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 19bfa3fb
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
......
......@@ -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 ()
......
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
......
......@@ -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
)
......@@ -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
)
......@@ -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 ()
......@@ -41,3 +41,8 @@ find_library(ENCHANT_LIBRARIES
PATHS ${PC_ENCHANT_LIBDIR}
${PC_ENCHANT_LIBRARY_DIRS}
)
mark_as_advanced(
ENCHANT_INCLUDE_DIRS
ENCHANT_LIBRARIES
)
......@@ -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
)
......@@ -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
)
......@@ -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
)
......@@ -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
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment