Browse Source

ENH: -apply the patches by Clinton Stimpson and Kenneth Moreland which fix
some QtMain issues on Windows
ENH: -sync with KDE svn FindQt4, which features a lot of enhancements

Alex

Alexander Neundorf 19 years ago
parent
commit
f59ad1aa6e
2 changed files with 499 additions and 419 deletions
  1. 486 419
      Modules/FindQt4.cmake
  2. 13 0
      Modules/UseQt4.cmake

File diff suppressed because it is too large
+ 486 - 419
Modules/FindQt4.cmake


+ 13 - 0
Modules/UseQt4.cmake

@@ -103,6 +103,19 @@ IF (QT_USE_QTDESIGNER)
   ENDIF (QT_QTDESIGNER_FOUND)
 ENDIF (QT_USE_QTDESIGNER)
 
+IF (QT_USE_QTMAIN)
+  IF (WIN32)
+    IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+      SET(QT_LIBRARIES ${QT_LIBRARIES}
+ optimized "${QT_QTMAIN_LIBRARY}"
+ debug "${QT_QTMAIN_LIBRARY_DEBUG}"
+ )
+    ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+      SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTMAIN_LIBRARY}")
+    ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+  ENDIF (WIN32)
+ENDIF (QT_USE_QTMAIN)
+
 IF (QT_USE_QTMOTIF)
   IF (QT_QTMOTIF_FOUND)
     INCLUDE_DIRECTORIES(${QT_QTMOTIF_INCLUDE_DIR})

Some files were not shown because too many files changed in this diff