summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2005-02-17 15:45:41 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2005-02-17 15:45:41 (GMT)
commit590ca038840ada98fa8c0879e87e05665e580b8e (patch)
tree1220693d8174e6723a14816f8ff0c94b14c219a1 /Modules
parent2fdca2bbaa6fc4ad422765fd2829d3885310fbc2 (diff)
downloadCMake-590ca038840ada98fa8c0879e87e05665e580b8e.zip
CMake-590ca038840ada98fa8c0879e87e05665e580b8e.tar.gz
CMake-590ca038840ada98fa8c0879e87e05665e580b8e.tar.bz2
FIX: fix for bug 1409
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindQt.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake
index 60961b8..39523e2 100644
--- a/Modules/FindQt.cmake
+++ b/Modules/FindQt.cmake
@@ -176,7 +176,7 @@ IF(QT_FOUND)
SET( QT_LIBRARIES ${QT_LIBRARIES} ${QT_QT_LIBRARY} )
SET( QT_DEFINITIONS "")
- IF (WIN32)
+ IF (WIN32 AND NOT CYGWIN)
IF (QT_QTMAIN_LIBRARY)
# for version 3
SET (QT_DEFINITIONS "-DQT_DLL -DQT_THREAD_SUPPORT -DNO_DEBUG")
@@ -186,7 +186,7 @@ IF(QT_FOUND)
# for version 2
SET (QT_LIBRARIES imm32.lib ws2_32.lib ${QT_QT_LIBRARY} )
ENDIF (QT_QTMAIN_LIBRARY)
- ELSE (WIN32)
+ ELSE (WIN32 AND NOT CYGWIN)
SET (QT_LIBRARIES ${QT_QT_LIBRARY} )
SET (QT_DEFINITIONS "-DQT_SHARED -DQT_NO_DEBUG")
@@ -194,7 +194,7 @@ IF(QT_FOUND)
SET (QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_THREAD_SUPPORT -D_REENTRANT)
ENDIF(QT_QT_LIBRARY MATCHES "qt-mt")
- ENDIF (WIN32)
+ ENDIF (WIN32 AND NOT CYGWIN)
IF (QT_QASSISTANTCLIENT_LIBRARY)
SET (QT_LIBRARIES ${QT_QASSISTANTCLIENT_LIBRARY} ${QT_LIBRARIES})