aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2007-01-03 22:51:00 +0000
committerAlexander Neundorf <neundorf@kde.org>2007-01-03 22:51:00 +0000
commitfb4c60a88ef88a4b2997c147ba7a28b249677d51 (patch)
tree85ce493c32b5cbce32cf17dd18902a4337079292
parent7706d8316d876760f708e9608c69376ecd6f8223 (diff)
downloadextra-cmake-modules-fb4c60a88ef88a4b2997c147ba7a28b249677d51.tar.gz
extra-cmake-modules-fb4c60a88ef88a4b2997c147ba7a28b249677d51.tar.bz2
mark more variables as advanced
Alex svn path=/trunk/KDE/kdelibs/; revision=619649
-rw-r--r--modules/FindQt4.cmake9
1 files changed, 2 insertions, 7 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake
index 220a9b46..899be654 100644
--- a/modules/FindQt4.cmake
+++ b/modules/FindQt4.cmake
@@ -509,7 +509,7 @@ IF (QT4_QMAKE_FOUND)
)
# Make variables changeble to the advanced user
- MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR)
+ MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR)
# Set QT_INCLUDES
SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default )
@@ -538,8 +538,6 @@ IF (QT4_QMAKE_FOUND)
# WTF? why don't we have frameworks? :P
SET(QT_QTUITOOLS_LIBRARY "-L${QT_LIBRARY_DIR} -lQtUiTools" CACHE STRING "The QtUiTools library.")
- MARK_AS_ADVANCED(QT_QT3SUPPORT_LIBRARY QT_QTGUI_LIBRARY )
-
ELSE (QT_USE_FRAMEWORKS)
# Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore." as part of the filename
@@ -582,9 +580,6 @@ IF (QT4_QMAKE_FOUND)
FIND_LIBRARY(QT_QTDBUS_LIBRARY NAMES QtDBus QtDBus4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
- # ? Why only those two?
- MARK_AS_ADVANCED(QT_QT3SUPPORT_LIBRARY QT_QTGUI_LIBRARY )
-
IF(MSVC)
FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG NAMES QtCored4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY_DEBUG NAMES Qt3Supportd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
@@ -751,7 +746,7 @@ IF (QT4_QMAKE_FOUND)
- MARK_AS_ADVANCED( QT_UIC_EXECUTABLE QT_UIC3_EXECUTABLE QT_MOC_EXECUTABLE QT_RCC_EXECUTABLE )
+ MARK_AS_ADVANCED( QT_UIC_EXECUTABLE QT_UIC3_EXECUTABLE QT_MOC_EXECUTABLE QT_RCC_EXECUTABLE QT_DBUSXML2CPP_EXECUTABLE QT_DBUSCPP2XML_EXECUTABLE)
######################################
#