Sfoglia il codice sorgente

ENH: Make it work for QT 2.3 non commercial on windows

Andy Cedilnik 22 anni fa
parent
commit
8a0e3c103b
2 ha cambiato i file con 4 aggiunte e 1 eliminazioni
  1. 3 1
      Modules/FindQt.cmake
  2. 1 0
      Tests/Wrapping/CMakeLists.txt

+ 3 - 1
Modules/FindQt.cmake

@@ -28,7 +28,7 @@ FIND_PATH(QT_INCLUDE_DIR qt.h
   )
 
 FIND_LIBRARY(QT_QT_LIBRARY 
-  NAMES qt qt-mt
+  NAMES qt qt-mt qt-mt230nc
   PATHS
   $ENV{QTDIR}/lib
   /usr/local/qt/lib
@@ -74,7 +74,9 @@ IF(QT_INCLUDE_DIR)
       IF (QT_QTMAIN_LIBRARY)
         # for version 3
         SET (QT_DEFINITIONS -DQT_DLL)
+        SET (QT_DEFINITIONS "-DQT_DLL -DQT_THREAD_SUPPORT -DNO_DEBUG")
         SET (QT_LIBRARIES imm32.lib  ${QT_QT_LIBRARY} ${QT_QTMAIN_LIBRARY} )
+        SET (QT_LIBRARIES ${QT_LIBRARIES} winmm wsock32)
       ELSE (QT_QTMAIN_LIBRARY)
         # for version 2
         SET (QT_LIBRARIES imm32.lib ws2_32.lib  ${QT_QT_LIBRARY} )

+ 1 - 0
Tests/Wrapping/CMakeLists.txt

@@ -119,6 +119,7 @@ IF (QT_FOUND)
   QT_WRAP_UI (qtwrapping QTUI_H_SRCS QTUI_S_SRCS QTUI_SRCS)
 
   MESSAGE("QT files are ${QTUI_S_SRCS}")
+  ADD_DEFINITIONS(${QT_DEFINITIONS})
   ADD_EXECUTABLE (qtwrapping qtwrappingmain.cxx QTUI_S_SRCS)
 
   TARGET_LINK_LIBRARIES( qtwrapping ${QT_LIBRARIES} )