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 9ff017da561985782af6b5d4b45f5c070ad3ce26 (commit) via 7fd3739ce75bfb94d49716739c965c12fd7eaa5b (commit) from af1665dbec7495f9568eda74fda0a95d8c50e0cb (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=9ff017da561985782af6b5d4b45f5c070ad3ce26 commit 9ff017da561985782af6b5d4b45f5c070ad3ce26 Merge: af1665d 7fd3739 Author: Clinton Stimpson <clin...@elemtech.com> Date: Tue Jul 6 14:37:38 2010 -0600 Merge branch 'findqt4-cross-compile' into next http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7fd3739ce75bfb94d49716739c965c12fd7eaa5b commit 7fd3739ce75bfb94d49716739c965c12fd7eaa5b Author: Clinton Stimpson <clin...@elemtech.com> Date: Tue Jul 6 14:37:16 2010 -0600 Find correct Qt plugins for cross-compiling. diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 1bdf2de..5f0bfe7 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -717,7 +717,13 @@ IF (QT4_QMAKE_FOUND) OUTPUT_VARIABLE qt_plugins_dir ) # make sure we have / and not \ as qmake gives on windows FILE(TO_CMAKE_PATH "${qt_plugins_dir}" qt_plugins_dir) - SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins" FORCE) + SET(QT_PLUGINS_DIR NOTFOUND) + foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH}) + set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/plugins") + endforeach(qt_cross_path) + 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") ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED) # ask qmake for the translations directory ----------------------------------------------------------------------- Summary of changes: Modules/FindQt4.cmake | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits