summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2003-08-01 23:13:38 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2003-08-01 23:13:38 (GMT)
commit8a0e3c103b67914c95536e82f1cb71c34c11b1ef (patch)
tree264a9885f50c82f7dbbb7d1a61e8170946572665 /Modules
parentf7000fa7b9331f17c262e24150450cc46f0ed9f7 (diff)
downloadCMake-8a0e3c103b67914c95536e82f1cb71c34c11b1ef.zip
CMake-8a0e3c103b67914c95536e82f1cb71c34c11b1ef.tar.gz
CMake-8a0e3c103b67914c95536e82f1cb71c34c11b1ef.tar.bz2
ENH: Make it work for QT 2.3 non commercial on windows
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindQt.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake
index 5153002..ed9a9a1 100644
--- a/Modules/FindQt.cmake
+++ b/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} )