mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-22 06:59:01 -06:00
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
This commit is contained in:
@@ -46,7 +46,7 @@ endforeach()
|
||||
if (QT4_INSTALLED)
|
||||
# record qt lib directory
|
||||
set ( ENV{${SQUISH_LIBQTDIR}} ${squish_libqtdir} )
|
||||
endif (QT4_INSTALLED)
|
||||
endif ()
|
||||
|
||||
# run the test
|
||||
if (WIN32)
|
||||
@@ -54,19 +54,19 @@ if (WIN32)
|
||||
COMMAND ${CMAKE_ROOT}/Modules/SquishRunTestCase.bat ${squish_server_executable} ${squish_client_executable} ${squish_test_case} ${squish_wrapper} ${squish_aut}
|
||||
RESULT_VARIABLE test_rv
|
||||
)
|
||||
endif (WIN32)
|
||||
endif ()
|
||||
|
||||
if (UNIX)
|
||||
execute_process(
|
||||
COMMAND ${CMAKE_ROOT}/Modules/SquishRunTestCase.sh ${squish_server_executable} ${squish_client_executable} ${squish_test_case} ${squish_wrapper} ${squish_aut}
|
||||
RESULT_VARIABLE test_rv
|
||||
)
|
||||
endif (UNIX)
|
||||
endif ()
|
||||
|
||||
# check for an error with running the test
|
||||
if(NOT "${test_rv}" STREQUAL "0")
|
||||
message(FATAL_ERROR "Error running Squish test")
|
||||
endif(NOT "${test_rv}" STREQUAL "0")
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user