[Cmake-commits] CMake branch, next, updated. v2.8.2-251-g6832485

[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  68324853a62e590138928e9946cd9f542bf72c7b (commit)
       via  c0194278ac9d96aac19d9ea928883302d155faec (commit)
      from  abed59e83dcace8a1e6de80a7a58f138cdc2b19b (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=68324853a62e590138928e9946cd9f542bf72c7b
commit 68324853a62e590138928e9946cd9f542bf72c7b
Merge: abed59e c019427
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Jul 15 10:23:56 2010 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Jul 15 10:23:56 2010 -0600

    Merge branch 'findqt4-cross-compile' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0194278ac9d96aac19d9ea928883302d155faec
commit c0194278ac9d96aac19d9ea928883302d155faec
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Jul 15 10:23:32 2010 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Jul 15 10:23:32 2010 -0600

    Fix mingw/VS warning message with cross compile re-org.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 5f0bfe7..0a813a4 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -607,6 +607,14 @@ IF (QT4_QMAKE_FOUND)
                  NAMES QtCore${QT_LIBINFIX}_debug QtCore${QT_LIBINFIX}d QtCore${QT_LIBINFIX}d4
                  HINTS ${QT_LIBRARY_DIR_TMP}
         )
+
+    # try dropping a hint if trying to use Visual Studio with Qt built by mingw
+    IF(NOT QT_QTCORE_LIBRARY_RELEASE AND MSVC)
+      IF(EXISTS ${QT_LIBRARY_DIR_TMP}/libqtmain.a)
+        MESSAGE( FATAL_ERROR "It appears you're trying to use Visual Studio with Qt built by mingw.  Those compilers do not produce code compatible with each other.")
+      ENDIF(EXISTS ${QT_LIBRARY_DIR_TMP}/libqtmain.a)
+    ENDIF(NOT QT_QTCORE_LIBRARY_RELEASE AND MSVC)
+
   ENDIF (NOT QT_QTCORE_LIBRARY OR QT_QMAKE_CHANGED)
 
   _QT4_ADJUST_LIB_VARS(QtCore)
@@ -623,14 +631,6 @@ IF (QT4_QMAKE_FOUND)
   ELSE()
     MESSAGE("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}")
     MESSAGE("Warning: But QtCore couldn't be found.  Qt must NOT be installed correctly.")
-
-    # try dropping a hint if trying to use Visual Studio with Qt built by mingw
-    IF(QT_LIBRARY_DIR AND MSVC)
-      IF(EXISTS ${QT_LIBRARY_DIR_TMP}/libqtmain.a)
-        MESSAGE( FATAL_ERROR "It appears you're trying to use Visual Studio with Qt built by mingw.  Those compilers do not produce code compatible with each other.")
-      ENDIF(EXISTS ${QT_LIBRARY_DIR_TMP}/libqtmain.a)
-    ENDIF(QT_LIBRARY_DIR AND MSVC)
-
     IF(Qt4_FIND_REQUIRED)
       MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.")
     ENDIF(Qt4_FIND_REQUIRED)

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

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


hooks/post-receive
-- 
CMake