kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Andy Cedilnik 2003-08-01 19:13:38 -04:00
parent f7000fa7b9
commit 8a0e3c103b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindQt.cmake
View File

@ -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
Tests/Wrapping/CMakeLists.txt
View File

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