diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-08 14:58:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-08 14:58:30 (GMT) |
| commit | 5c57fdedb19897880e5c13f9a0dd35ad4087565c (patch) | |
| tree | 2a7b4078c4532e9a26b6a949a842269bd6dffb61 /Modules | |
| parent | 4340507207830c5d82ca59b2e82cddf6dbf8f36b (diff) | |
| parent | 1bbc7662ea2319e02322664b00ca645acde7f723 (diff) | |
| download | CMake-5c57fdedb19897880e5c13f9a0dd35ad4087565c.zip CMake-5c57fdedb19897880e5c13f9a0dd35ad4087565c.tar.gz CMake-5c57fdedb19897880e5c13f9a0dd35ad4087565c.tar.bz2 | |
Merge topic 'FindGTK2-quiet'
1bbc766 FindGTK2: Search for modules quietly when needed
d9eb277 FindGTK2: Find freetype quietly
675a4d3 FindGTK2: Mark GTK_*_INCLUDE_DIR as advanced
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindGTK2.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 77aac6d..316a2da 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -240,6 +240,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr) PATH_SUFFIXES ${_suffixes} ) + mark_as_advanced(GTK2_${_var}_INCLUDE_DIR) if(${_var}_INCLUDE_DIR) set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${${_var}_INCLUDE_DIR} PARENT_SCOPE) @@ -449,7 +450,7 @@ endif() # Find all components # -find_package(Freetype) +find_package(Freetype QUIET) list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS}) list(APPEND GTK2_LIBRARIES ${FREETYPE_LIBRARIES}) @@ -586,6 +587,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) string(TOUPPER ${_GTK2_component} _COMPONENT_UPPER) + set(GTK2_${_COMPONENT_UPPER}_FIND_QUIETLY ${GTK2_FIND_QUIETLY}) + if(_GTK2_component STREQUAL "gtk") FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "Some or all of the gtk libraries were not found." GTK2_GTK_LIBRARY |