diff options
author | Kitware Robot <kwrobot@kitware.com> | 2012-08-13 17:50:14 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2012-08-13 18:19:16 (GMT) |
commit | 9db3116226cb99fcf54e936c833953abcde9b729 (patch) | |
tree | bd755ed9e616bbf1482a894bc7946980d81b7703 /Modules/FindPerlLibs.cmake | |
parent | 77543bde41b0e52c3959016698b529835945d62d (diff) | |
download | CMake-9db3116226cb99fcf54e936c833953abcde9b729.zip CMake-9db3116226cb99fcf54e936c833953abcde9b729.tar.gz CMake-9db3116226cb99fcf54e936c833953abcde9b729.tar.bz2 |
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/FindPerlLibs.cmake')
-rw-r--r-- | Modules/FindPerlLibs.cmake | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Modules/FindPerlLibs.cmake b/Modules/FindPerlLibs.cmake index 101aebf..e9313ad 100644 --- a/Modules/FindPerlLibs.cmake +++ b/Modules/FindPerlLibs.cmake @@ -53,7 +53,7 @@ if (PERL_EXECUTABLE) if (NOT PERL_PREFIX_RESULT_VARIABLE) string(REGEX REPLACE "prefix='([^']+)'.*" "\\1" PERL_PREFIX ${PERL_PREFIX_OUTPUT_VARIABLE}) - endif (NOT PERL_PREFIX_RESULT_VARIABLE) + endif () ### PERL_ARCHNAME execute_process( @@ -66,7 +66,7 @@ if (PERL_EXECUTABLE) ) if (NOT PERL_ARCHNAME_RESULT_VARIABLE) string(REGEX REPLACE "archname='([^']+)'.*" "\\1" PERL_ARCHNAME ${PERL_ARCHNAME_OUTPUT_VARIABLE}) - endif (NOT PERL_ARCHNAME_RESULT_VARIABLE) + endif () @@ -81,7 +81,7 @@ if (PERL_EXECUTABLE) ) if (NOT PERL_CPPFLAGS_RESULT_VARIABLE) string(REGEX REPLACE "cppflags='([^']+)'.*" "\\1" PERL_EXTRA_C_FLAGS ${PERL_CPPFLAGS_OUTPUT_VARIABLE}) - endif (NOT PERL_CPPFLAGS_RESULT_VARIABLE) + endif () ### PERL_SITESEARCH execute_process( @@ -95,7 +95,7 @@ if (PERL_EXECUTABLE) if (NOT PERL_SITESEARCH_RESULT_VARIABLE) string(REGEX REPLACE "install[a-z]+='([^']+)'.*" "\\1" PERL_SITESEARCH ${PERL_SITESEARCH_OUTPUT_VARIABLE}) file(TO_CMAKE_PATH "${PERL_SITESEARCH}" PERL_SITESEARCH) - endif (NOT PERL_SITESEARCH_RESULT_VARIABLE) + endif () ### PERL_SITELIB execute_process( @@ -109,7 +109,7 @@ if (PERL_EXECUTABLE) if (NOT PERL_SITELIB_RESULT_VARIABLE) string(REGEX REPLACE "install[a-z]+='([^']+)'.*" "\\1" PERL_SITELIB ${PERL_SITELIB_OUTPUT_VARIABLE}) file(TO_CMAKE_PATH "${PERL_SITELIB}" PERL_SITELIB) - endif (NOT PERL_SITELIB_RESULT_VARIABLE) + endif () ### PERL_VENDORARCH execute_process( @@ -123,7 +123,7 @@ if (PERL_EXECUTABLE) if (NOT PERL_VENDORARCH_RESULT_VARIABLE) string(REGEX REPLACE "install[a-z]+='([^']+)'.*" "\\1" PERL_VENDORARCH ${PERL_VENDORARCH_OUTPUT_VARIABLE}) file(TO_CMAKE_PATH "${PERL_VENDORARCH}" PERL_VENDORARCH) - endif (NOT PERL_VENDORARCH_RESULT_VARIABLE) + endif () ### PERL_VENDORLIB execute_process( @@ -137,7 +137,7 @@ if (PERL_EXECUTABLE) if (NOT PERL_VENDORLIB_RESULT_VARIABLE) string(REGEX REPLACE "install[a-z]+='([^']+)'.*" "\\1" PERL_VENDORLIB ${PERL_VENDORLIB_OUTPUT_VARIABLE}) file(TO_CMAKE_PATH "${PERL_VENDORLIB}" PERL_VENDORLIB) - endif (NOT PERL_VENDORLIB_RESULT_VARIABLE) + endif () macro(perl_adjust_darwin_lib_variable varname) string( TOUPPER PERL_${varname} FINDPERL_VARNAME ) @@ -160,9 +160,9 @@ if (PERL_EXECUTABLE) if (PERL_NEEDS_ADJUSTMENT) string(REGEX REPLACE "(.*)/Updates/" "/System/\\1/" ${FINDPERL_VARNAME} ${${FINDPERL_VARNAME}}) - endif (PERL_NEEDS_ADJUSTMENT) + endif () - endif (NOT PERL_MINUSV_RESULT_VARIABLE) + endif () endmacro() ### PERL_ARCHLIB @@ -178,7 +178,7 @@ if (PERL_EXECUTABLE) string(REGEX REPLACE "install[a-z]+='([^']+)'.*" "\\1" PERL_ARCHLIB ${PERL_ARCHLIB_OUTPUT_VARIABLE}) perl_adjust_darwin_lib_variable( ARCHLIB ) file(TO_CMAKE_PATH "${PERL_ARCHLIB}" PERL_ARCHLIB) - endif (NOT PERL_ARCHLIB_RESULT_VARIABLE) + endif () ### PERL_PRIVLIB execute_process( @@ -193,7 +193,7 @@ if (PERL_EXECUTABLE) string(REGEX REPLACE "install[a-z]+='([^']+)'.*" "\\1" PERL_PRIVLIB ${PERL_PRIVLIB_OUTPUT_VARIABLE}) perl_adjust_darwin_lib_variable( PRIVLIB ) file(TO_CMAKE_PATH "${PERL_PRIVLIB}" PERL_PRIVLIB) - endif (NOT PERL_PRIVLIB_RESULT_VARIABLE) + endif () ### PERL_POSSIBLE_LIBRARY_NAMES execute_process( @@ -206,9 +206,9 @@ if (PERL_EXECUTABLE) ) if (NOT PERL_LIBRARY_RESULT_VARIABLE) string(REGEX REPLACE "libperl='([^']+)'.*" "\\1" PERL_POSSIBLE_LIBRARY_NAMES ${PERL_LIBRARY_OUTPUT_VARIABLE}) - else (NOT PERL_LIBRARY_RESULT_VARIABLE) + else () set(PERL_POSSIBLE_LIBRARY_NAMES perl${PERL_VERSION_STRING} perl) - endif (NOT PERL_LIBRARY_RESULT_VARIABLE) + endif () ### PERL_INCLUDE_PATH find_path(PERL_INCLUDE_PATH @@ -234,7 +234,7 @@ if (PERL_EXECUTABLE) /usr/lib/perl/${PERL_VERSION_STRING}/CORE ) -endif (PERL_EXECUTABLE) +endif () # handle the QUIETLY and REQUIRED arguments and set PERLLIBS_FOUND to TRUE if # all listed variables are TRUE |