ENH: only add optional qt stuff to QT_INCLUDES
This commit is contained in:
parent
f81412aedf
commit
c6fbe4a980
|
@ -47,7 +47,11 @@
|
||||||
# QT_DEFINITIONS Definitions to use when compiling code that
|
# QT_DEFINITIONS Definitions to use when compiling code that
|
||||||
# uses Qt.
|
# uses Qt.
|
||||||
#
|
#
|
||||||
# QT_INCLUDES List of paths to all include directories of Qt4
|
# QT_INCLUDES List of paths to all include directories of
|
||||||
|
# Qt4 QT_INCLUDE_DIR, QT_QT_INCLUDE_DIR, and QT_QTGUI_INCLUDE_DIR are
|
||||||
|
# always in this variable even if NOTFOUND, all other INCLUDE_DIRS are
|
||||||
|
# only added if they are found.
|
||||||
|
#
|
||||||
# QT_INCLUDE_DIR Path to "include" of Qt4
|
# QT_INCLUDE_DIR Path to "include" of Qt4
|
||||||
# QT_QT_INCLUDE_DIR Path to "include/Qt" of Qt4
|
# QT_QT_INCLUDE_DIR Path to "include/Qt" of Qt4
|
||||||
# QT_QT3SUPPORT_INCLUDE_DIR Path to "include/Qt3Support" of Qt
|
# QT_QT3SUPPORT_INCLUDE_DIR Path to "include/Qt3Support" of Qt
|
||||||
|
@ -302,19 +306,26 @@ IF(QT4_QMAKE_FOUND)
|
||||||
# Set QT_INCLUDES
|
# Set QT_INCLUDES
|
||||||
SET( QT_INCLUDES
|
SET( QT_INCLUDES
|
||||||
${QT_INCLUDE_DIR}
|
${QT_INCLUDE_DIR}
|
||||||
${QT_QT_INCLUDE_DIR}
|
|
||||||
${QT_QT3SUPPORT_INCLUDE_DIR}
|
|
||||||
${QT_QTASSISTANT_INCLUDE_DIR}
|
|
||||||
${QT_QTCORE_INCLUDE_DIR}
|
${QT_QTCORE_INCLUDE_DIR}
|
||||||
${QT_QTDESIGNER_INCLUDE_DIR}
|
${QT_QT_INCLUDE_DIR}
|
||||||
${QT_QTDESIGNER_INCLUDE_DIR}/..
|
|
||||||
${QT_QTGUI_INCLUDE_DIR}
|
${QT_QTGUI_INCLUDE_DIR}
|
||||||
${QT_QTMOTIF_INCLUDE_DIR}
|
)
|
||||||
${QT_QTNETWORK_INCLUDE_DIR}
|
# append optional flags
|
||||||
${QT_QTNSPLUGIN_INCLUDE_DIR}
|
MACRO(QT4_APPEND_INCLUDES_FLAG FLAG)
|
||||||
${QT_QTOPENGL_INCLUDE_DIR}
|
IF(${FLAG})
|
||||||
${QT_QTSQL_INCLUDE_DIR}
|
SET(QT_INCLUDES ${QT_INCLUDES} "${${FLAG}}")
|
||||||
${QT_QTXML_INCLUDE_DIR} )
|
ENDIF(${FLAG})
|
||||||
|
ENDMACRO(APPEND_INCLUDE_FLAG)
|
||||||
|
QT4_APPEND_INCLUDES_FLAG(QT_QT3SUPPORT_INCLUDE_DIR)
|
||||||
|
QT4_APPEND_INCLUDES_FLAG(QT_QTASSISTANT_INCLUDE_DIR)
|
||||||
|
QT4_APPEND_INCLUDES_FLAG(QT_QTDESIGNER_INCLUDE_DIR)
|
||||||
|
QT4_APPEND_INCLUDES_FLAG(QT_QTDESIGNER_INCLUDE_DIR)
|
||||||
|
QT4_APPEND_INCLUDES_FLAG(QT_QTMOTIF_INCLUDE_DIR)
|
||||||
|
QT4_APPEND_INCLUDES_FLAG(QT_QTNETWORK_INCLUDE_DIR)
|
||||||
|
QT4_APPEND_INCLUDES_FLAG(QT_QTNSPLUGIN_INCLUDE_DIR)
|
||||||
|
QT4_APPEND_INCLUDES_FLAG(QT_QTOPENGL_INCLUDE_DIR)
|
||||||
|
QT4_APPEND_INCLUDES_FLAG(QT_QTSQL_INCLUDE_DIR)
|
||||||
|
QT4_APPEND_INCLUDES_FLAG(QT_QTXML_INCLUDE_DIR)
|
||||||
|
|
||||||
|
|
||||||
########################################
|
########################################
|
||||||
|
|
Loading…
Reference in New Issue