[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3824-gfdc4d43
Daniele E. Domenichelli
daniele.domenichelli at gmail.com
Fri Aug 9 10:56:32 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via fdc4d4385353a2bd387fe5a80ac8b440b7fc3e62 (commit)
via 1e18051f687836052479b70f28c520a5e0626dd7 (commit)
via 873333d1044a9ddda419b9779c54ab112d66b736 (commit)
via 53265aa79904ec0b753776fe86656a1117cce74a (commit)
from ffc7a0bb79fdf71c89bc6f10089406abda259379 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fdc4d4385353a2bd387fe5a80ac8b440b7fc3e62
commit fdc4d4385353a2bd387fe5a80ac8b440b7fc3e62
Merge: ffc7a0b 1e18051
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Fri Aug 9 10:56:30 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 9 10:56:30 2013 -0400
Merge topic 'FindGTK2-quiet' into next
1e18051 FindGTK2: Search for modules quietly when needed
873333d FindGTK2: Find freetype quietly
53265aa FindGTK2: Mark GTK_*_INCLUDE_DIR as advanced
diff --cc Modules/FindGTK2.cmake
index d5b0f35,8ad0b51..05b13fd
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@@ -241,9 -240,10 +241,10 @@@ function(_GTK2_FIND_INCLUDE_DIR _var _h
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)
+ if(GTK2_${_var}_INCLUDE_DIR)
+ set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTK2_${_var}_INCLUDE_DIR} PARENT_SCOPE)
endif()
endfunction()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e18051f687836052479b70f28c520a5e0626dd7
commit 1e18051f687836052479b70f28c520a5e0626dd7
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Fri Aug 9 15:37:52 2013 +0200
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Fri Aug 9 16:55:08 2013 +0200
FindGTK2: Search for modules quietly when needed
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 6147361..8ad0b51 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -587,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
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=873333d1044a9ddda419b9779c54ab112d66b736
commit 873333d1044a9ddda419b9779c54ab112d66b736
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Fri Aug 9 10:55:48 2013 +0200
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Fri Aug 9 16:55:08 2013 +0200
FindGTK2: Find freetype quietly
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index b604657..6147361 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -450,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})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53265aa79904ec0b753776fe86656a1117cce74a
commit 53265aa79904ec0b753776fe86656a1117cce74a
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Fri Aug 9 11:07:07 2013 +0200
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Fri Aug 9 16:55:08 2013 +0200
FindGTK2: Mark GTK_*_INCLUDE_DIR as advanced
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 77aac6d..b604657 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)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindGTK2.cmake | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list