diff options
author | Kitware Robot <kwrobot@kitware.com> | 2012-08-13 13:50:14 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2012-08-13 14:19:16 -0400 |
commit | 9db3116226cb99fcf54e936c833953abcde9b729 (patch) | |
tree | bd755ed9e616bbf1482a894bc7946980d81b7703 /Modules/UseQt4.cmake | |
parent | 77543bde41b0e52c3959016698b529835945d62d (diff) | |
download | cmake-9db3116226cb99fcf54e936c833953abcde9b729.tar.gz |
Remove CMake-language block-end command arguments
Ancient versions of CMake required else(), endif(), and similar block
termination commands to have arguments matching the command starting the
block. This is no longer the preferred style.
Run the following shell code:
for c in else endif endforeach endfunction endmacro endwhile; do
echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
egrep -z -v 'Tests/CMakeTests/While-Endwhile-' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
Diffstat (limited to 'Modules/UseQt4.cmake')
-rw-r--r-- | Modules/UseQt4.cmake | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake index 260c3cd292..e8166f4fc7 100644 --- a/Modules/UseQt4.cmake +++ b/Modules/UseQt4.cmake @@ -33,24 +33,24 @@ set(QT_LIBRARIES_PLUGINS "") if (QT_USE_QTMAIN) if (Q_WS_WIN) set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}) - endif (Q_WS_WIN) -endif (QT_USE_QTMAIN) + endif () +endif () if(QT_DONT_USE_QTGUI) set(QT_USE_QTGUI 0) -else(QT_DONT_USE_QTGUI) +else() set(QT_USE_QTGUI 1) -endif(QT_DONT_USE_QTGUI) +endif() if(QT_DONT_USE_QTCORE) set(QT_USE_QTCORE 0) -else(QT_DONT_USE_QTCORE) +else() set(QT_USE_QTCORE 1) -endif(QT_DONT_USE_QTCORE) +endif() if (QT_USE_QT3SUPPORT) add_definitions(-DQT3_SUPPORT) -endif (QT_USE_QT3SUPPORT) +endif () # list dependent modules, so dependent libraries are added set(QT_QT3SUPPORT_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE) @@ -59,9 +59,9 @@ set(QT_QTUITOOLS_MODULE_DEPENDS QTGUI QTXML QTCORE) set(QT_QTHELP_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE) if(QT_QTDBUS_FOUND) set(QT_PHONON_MODULE_DEPENDS QTGUI QTDBUS QTCORE) -else(QT_QTDBUS_FOUND) +else() set(QT_PHONON_MODULE_DEPENDS QTGUI QTCORE) -endif(QT_QTDBUS_FOUND) +endif() set(QT_QTDBUS_MODULE_DEPENDS QTXML QTCORE) set(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE) set(QT_QAXCONTAINER_MODULE_DEPENDS QTGUI QTCORE) @@ -90,19 +90,19 @@ foreach(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN string(REPLACE "QT" "" qt_module_def "${module}") add_definitions(-DQT_${qt_module_def}_LIB) include_directories(${QT_${module}_INCLUDE_DIR}) - endif(QT_USE_${module}) + endif() set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY}) set(QT_LIBRARIES_PLUGINS ${QT_LIBRARIES_PLUGINS} ${QT_${module}_PLUGINS}) if(QT_IS_STATIC) set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIB_DEPENDENCIES}) - endif(QT_IS_STATIC) + endif() foreach(depend_module ${QT_${module}_MODULE_DEPENDS}) set(QT_USE_${depend_module}_DEPENDS 1) - endforeach(depend_module ${QT_${module}_MODULE_DEPENDS}) - else (QT_${module}_FOUND) + endforeach() + else () message("Qt ${module} library not found.") - endif (QT_${module}_FOUND) - endif (QT_USE_${module} OR QT_USE_${module}_DEPENDS) + endif () + endif () -endforeach(module) +endforeach() |