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 cb802bb16cab57f412577d1bc409d8f865b9eee6 (commit)
via 28f8ee492c68b4a7b95049e2e5f855a1d3d74d29 (commit)
from d27d193dae931d1c6e84d344418e52f05378f146 (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=cb802bb16cab57f412577d1bc409d8f865b9eee6
commit cb802bb16cab57f412577d1bc409d8f865b9eee6
Merge: d27d193 28f8ee4
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Wed Jan 8 08:06:59 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 8 08:06:59 2014 -0500
Merge topic 'qt4-find-root' into next
28f8ee4 FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already
rooted.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28f8ee492c68b4a7b95049e2e5f855a1d3d74d29
commit 28f8ee492c68b4a7b95049e2e5f855a1d3d74d29
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:01:58 2014 -0700
FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.
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:
Modules/FindQt4.cmake | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
