diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2006-11-06 12:38:46 +0000 |
|---|---|---|
| committer | Peter Kümmel <syntheticpp@gmx.net> | 2006-11-06 12:38:46 +0000 |
| commit | a5e5b704dbbc3507ba4df02bf68519424c9c499f (patch) | |
| tree | 3255e8a1713b271461a3403d8ec74883408f8776 | |
| parent | f10602133356f21ced8bfe3a64c24f68312009f5 (diff) | |
| download | extra-cmake-modules-a5e5b704dbbc3507ba4df02bf68519424c9c499f.tar.gz extra-cmake-modules-a5e5b704dbbc3507ba4df02bf68519424c9c499f.tar.bz2 | |
qtmain/qtmaind changes:
* remove usage of dummy QT_QTMAIN_INCLUDE_DIR
* make qtmain library code more consistent with the rest
CCMAIL:neundorf@kde.org
svn path=/trunk/KDE/kdelibs/; revision=602637
| -rw-r--r-- | modules/FindQt4.cmake | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index a9225f7b..a0f7a48e 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -570,6 +570,7 @@ IF (QT4_QMAKE_FOUND) FIND_LIBRARY(QT_QTTEST_LIBRARY_DEBUG NAMES QtTestd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTDBUS_LIBRARY_DEBUG NAMES QtDBusd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmaind PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) ENDIF(MSVC) ENDIF (QT_USE_FRAMEWORKS) @@ -591,10 +592,7 @@ IF (QT4_QMAKE_FOUND) # Set QT_QTMAIN_LIBRARY IF(WIN32) - FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain PATHS ${QT_LIBRARY_DIR} - NO_DEFAULT_PATH) - FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmaind PATHS ${QT_LIBRARY_DIR} - NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QTMAIN_LIBRARY NAMES qtmain PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) ENDIF(WIN32) ############################################ @@ -604,7 +602,7 @@ IF (QT4_QMAKE_FOUND) ############################################ MACRO (_QT4_ADJUST_LIB_VARS basename) - IF (QT_${basename}_INCLUDE_DIR) + IF (QT_${basename}_LIBRARY OR QT_${basename}_LIBRARY_DEBUG) IF(MSVC) @@ -628,32 +626,27 @@ IF (QT4_QMAKE_FOUND) IF (QT_${basename}_LIBRARY) SET(QT_${basename}_FOUND 1) ENDIF (QT_${basename}_LIBRARY) - + + ENDIF (QT_${basename}_LIBRARY OR QT_${basename}_LIBRARY_DEBUG) + + IF (QT_${basename}_INCLUDE_DIR) #add the include directory to QT_INCLUDES SET(QT_INCLUDES ${QT_INCLUDES} "${QT_${basename}_INCLUDE_DIR}") - ENDIF (QT_${basename}_INCLUDE_DIR ) + ENDIF (QT_${basename}_INCLUDE_DIR) # Make variables changeble to the advanced user MARK_AS_ADVANCED(QT_${basename}_LIBRARY QT_${basename}_INCLUDE_DIR) ENDMACRO (_QT4_ADJUST_LIB_VARS) - IF(WIN32) - # there is no include for qtmain but adjust macro needs it set - SET(QT_QTMAIN_INCLUDE_DIR 1) - _QT4_ADJUST_LIB_VARS(QTMAIN) - SET(QT_QTMAIN_INCLUDE_DIR ) - ENDIF(WIN32) - + # Set QT_xyz_LIBRARY variable and add + # library include path to QT_INCLUDES _QT4_ADJUST_LIB_VARS(QTCORE) _QT4_ADJUST_LIB_VARS(QTGUI) _QT4_ADJUST_LIB_VARS(QT3SUPPORT) _QT4_ADJUST_LIB_VARS(QTASSISTANT) _QT4_ADJUST_LIB_VARS(QTDESIGNER) _QT4_ADJUST_LIB_VARS(QTDESIGNERCOMPONENTS) - IF(Q_WS_X11) - _QT4_ADJUST_LIB_VARS(QTMOTIF) - ENDIF(Q_WS_X11) _QT4_ADJUST_LIB_VARS(QTNETWORK) _QT4_ADJUST_LIB_VARS(QTNSPLUGIN) _QT4_ADJUST_LIB_VARS(QTOPENGL) @@ -663,6 +656,16 @@ IF (QT4_QMAKE_FOUND) _QT4_ADJUST_LIB_VARS(QTUITOOLS) _QT4_ADJUST_LIB_VARS(QTTEST) _QT4_ADJUST_LIB_VARS(QTDBUS) + + + # platform dependent libraries + IF(Q_WS_X11) + _QT4_ADJUST_LIB_VARS(QTMOTIF) + ENDIF(Q_WS_X11) + IF(WIN32) + _QT4_ADJUST_LIB_VARS(QTMAIN) + ENDIF(WIN32) + ####################################### # |