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

ENH: should define QT_DLL instead of QT_SHARED

Browse Source
This commit is contained in:
Clinton Stimpson 2007-12-18 14:50:18 -05:00
parent b383d98771
commit f5f397debd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/FindQt4.cmake
View File

@ -1143,12 +1143,11 @@ IF (QT4_QMAKE_FOUND)
SET(QT_GUI_LIB_DEPENDENCIES "") SET(QT_GUI_LIB_DEPENDENCIES "")
SET(QT_CORE_LIB_DEPENDENCIES "") SET(QT_CORE_LIB_DEPENDENCIES "")
# shared build needs -DQT_SHARED # build using shared Qt needs -DQT_DLL
IF(NOT QT_CONFIG MATCHES "static") IF(NOT QT_CONFIG MATCHES "static")
# warning currently only qconfig.pri on Windows potentially contains "static" # warning currently only qconfig.pri on Windows potentially contains "static"
# so QT_SHARED might not get defined properly on Mac/X11 (which seems harmless right now) # so QT_DLL might not get defined properly on other platforms.
# Trolltech said they'd consider exporting it for all platforms in future releases. SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL)
SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_SHARED)
ENDIF(NOT QT_CONFIG MATCHES "static") ENDIF(NOT QT_CONFIG MATCHES "static")
## system png ## system png