diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-12-16 10:49:23 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-12-16 10:49:23 (GMT) |
| commit | 7bcafb410fd3cfff007ece786d948e63ff7836ab (patch) | |
| tree | c793dd86a1a6f278469bc42bf9d9ad45acc9e84e /Modules | |
| parent | eb098e1970d5a1eee236e926e28e087d07998fd1 (diff) | |
| download | CMake-7bcafb410fd3cfff007ece786d948e63ff7836ab.zip CMake-7bcafb410fd3cfff007ece786d948e63ff7836ab.tar.gz CMake-7bcafb410fd3cfff007ece786d948e63ff7836ab.tar.bz2 | |
STYLE: some whitespace syncing with FindQt4.cmake in KDE svn
Alex
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index efd4012..981fd11 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -247,6 +247,7 @@ MACRO(QT_QUERY_QMAKE outvar invar) ENDIF(_qmake_result) ENDMACRO(QT_QUERY_QMAKE) + GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) # check for qmake FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS @@ -261,6 +262,7 @@ IF (QT_QMAKE_EXECUTABLE) SET(QT4_QMAKE_FOUND FALSE) EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION) + # check for qt3 qmake and then try and find qmake4 or qmake-qt4 in the path IF("${QTVERSION}" MATCHES "Unknown") SET(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE) @@ -857,6 +859,7 @@ IF (QT4_QMAKE_FOUND) FOREACH(_current ${_inc_DIRS}) SET(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-I" ${_current}) ENDFOREACH(_current ${_inc_DIRS}) + ENDMACRO(QT4_GET_MOC_INC_DIRS) @@ -974,11 +977,9 @@ IF (QT4_QMAKE_FOUND) MACRO(QT4_ADD_DBUS_INTERFACES _sources) FOREACH (_current_FILE ${ARGN}) GET_FILENAME_COMPONENT(_infile ${_current_FILE} ABSOLUTE) - - # get the part before the ".xml" suffix + # get the part before the ".xml" suffix STRING(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2" _basename ${_current_FILE}) STRING(TOLOWER ${_basename} _basename) - QT4_ADD_DBUS_INTERFACE(${_sources} ${_infile} ${_basename}interface) ENDFOREACH (_current_FILE) ENDMACRO(QT4_ADD_DBUS_INTERFACES) |