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 2e29e1c717a47bddb419df54c754b22d6bfaaf6c (commit) via e8b8b37ef6fef094940d3384df5a1d421b9fa568 (commit) from cb802bb16cab57f412577d1bc409d8f865b9eee6 (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=2e29e1c717a47bddb419df54c754b22d6bfaaf6c commit 2e29e1c717a47bddb419df54c754b22d6bfaaf6c Merge: cb802bb e8b8b37 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Wed Jan 8 08:08:02 2014 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Jan 8 08:08:02 2014 -0500 Merge topic 'qt4-find-root' into next e8b8b37 FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8b8b37ef6fef094940d3384df5a1d421b9fa568 commit e8b8b37ef6fef094940d3384df5a1d421b9fa568 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Wed Jan 8 06:01:58 2014 -0700 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Wed Jan 8 06:07:24 2014 -0700 FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted. Thanks to Thomas Petazzoni for part of this fix. diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 28b8454..46d3741 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -761,7 +761,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) set(QT_MKSPECS_DIR NOTFOUND) find_path(QT_MKSPECS_DIR NAMES qconfig.pri HINTS ${qt_cross_paths} ${qt_mkspecs_dirs} - DOC "The location of the Qt mkspecs containing qconfig.pri") + DOC "The location of the Qt mkspecs containing qconfig.pri" + NO_CMAKE_FIND_ROOT_PATH) endif() if(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri") @@ -917,7 +918,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) endforeach() find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer HINTS ${qt_cross_paths} ${qt_plugins_dir} - DOC "The location of the Qt plugins") + DOC "The location of the Qt plugins" + NO_CMAKE_FIND_ROOT_PATH) endif () # ask qmake for the translations directory @@ -937,6 +939,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) find_path(QT_IMPORTS_DIR NAMES Qt HINTS ${qt_cross_paths} ${qt_imports_dir} DOC "The location of the Qt imports" + NO_CMAKE_FIND_ROOT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) mark_as_advanced(QT_IMPORTS_DIR) ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits