Browse Source

ENH: fix qtmain for release

Bill Hoffman 19 years ago
parent
commit
7776d18896
2 changed files with 3 additions and 8 deletions
  1. 0 5
      Modules/FindQt4.cmake
  2. 3 3
      Modules/UseQt4.cmake

+ 0 - 5
Modules/FindQt4.cmake

@@ -541,11 +541,6 @@ IF (QT4_QMAKE_FOUND)
       NO_DEFAULT_PATH)
     FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmaind PATHS ${QT_LIBRARY_DIR}
       NO_DEFAULT_PATH)
-    IF(QT_QTMAIN_LIBRARY_RELEASE)
-      SET(QT_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARY_RELEASE})
-    ELSE(QT_QTMAIN_LIBRARY_RELEASE)
-      SET(QT_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARY_DEBUG})
-    ENDIF(QT_QTMAIN_LIBRARY_RELEASE)
   ENDIF(WIN32)
 
   ############################################

+ 3 - 3
Modules/UseQt4.cmake

@@ -107,9 +107,9 @@ IF (QT_USE_QTMAIN)
   IF (WIN32)
     IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
       SET(QT_LIBRARIES ${QT_LIBRARIES}
- optimized "${QT_QTMAIN_LIBRARY_RELEASE}"
- debug "${QT_QTMAIN_LIBRARY_DEBUG}"
- )
+        optimized "${QT_QTMAIN_LIBRARY_RELEASE}"
+        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)