Explorar o código

ENH: fix qtmain for release

Bill Hoffman %!s(int64=19) %!d(string=hai) anos
pai
achega
4cafb72616
Modificáronse 2 ficheiros con 6 adicións e 1 borrados
  1. 5 0
      Modules/FindQt4.cmake
  2. 1 1
      Modules/UseQt4.cmake

+ 5 - 0
Modules/FindQt4.cmake

@@ -541,6 +541,11 @@ 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)
 
   ############################################

+ 1 - 1
Modules/UseQt4.cmake

@@ -107,7 +107,7 @@ IF (QT_USE_QTMAIN)
   IF (WIN32)
     IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
       SET(QT_LIBRARIES ${QT_LIBRARIES}
- optimized "${QT_QTMAIN_LIBRARY}"
+ optimized "${QT_QTMAIN_LIBRARY_RELEASE}"
  debug "${QT_QTMAIN_LIBRARY_DEBUG}"
  )
     ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)