From 8a0e3c103b67914c95536e82f1cb71c34c11b1ef Mon Sep 17 00:00:00 2001
From: Andy Cedilnik <andy.cedilnik@kitware.com>
Date: Fri, 1 Aug 2003 19:13:38 -0400
Subject: ENH: Make it work for QT 2.3 non commercial on windows

---
 Modules/FindQt.cmake          | 4 +++-
 Tests/Wrapping/CMakeLists.txt | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

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} )
diff --git a/Tests/Wrapping/CMakeLists.txt b/Tests/Wrapping/CMakeLists.txt
index 28d9228..6f73fcb 100644
--- a/Tests/Wrapping/CMakeLists.txt
+++ b/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} )
-- 
cgit v0.12