|
|
@@ -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})
|
Bill Hoffman