[Cmake-commits] CMake branch, next, updated. v2.8.2-179-g6b5f498

[Clinton Stimpson]

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  6b5f498e4b0cad48d7fceee3640bcb7f488ce0be (commit)
       via  22e725fb880e74b013e434d48bb6b2a1e7d84b75 (commit)
      from  e20e61c1fcd5c748b6ab05b75f12564307e0fa4e (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=6b5f498e4b0cad48d7fceee3640bcb7f488ce0be
commit 6b5f498e4b0cad48d7fceee3640bcb7f488ce0be
Merge: e20e61c 22e725f
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Sat Jul 3 08:58:52 2010 -0600

    Merge branch 'findqt4-cross-compile' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22e725fb880e74b013e434d48bb6b2a1e7d84b75
commit 22e725fb880e74b013e434d48bb6b2a1e7d84b75
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Sat Jul 3 08:58:25 2010 -0600

    Tweak for cygwin, don't convert : to ;

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 95daee9..a27b985 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -560,9 +560,9 @@ IF (QT4_QMAKE_FOUND)
       OUTPUT_VARIABLE qt_mkspecs_dirs )
     # do not replace : on windows as it might be a drive letter
     # and windows should already use ; as a separator
-    IF(UNIX)
+    IF(NOT WIN32)
       STRING(REPLACE ":" ";" qt_mkspecs_dirs "${qt_mkspecs_dirs}")
-    ENDIF(UNIX)
+    ENDIF(NOT WIN32)
     set(qt_cross_paths)
     foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
       set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/mkspecs")

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindQt4.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake