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/FindPNG.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/FindPNG.cmake')
| -rw-r--r-- | Modules/FindPNG.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake index 50cb7d8..d96d2cc 100644 --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -30,7 +30,7 @@ if(PNG_FIND_QUIETLY) set(_FIND_ZLIB_ARG QUIET) -endif(PNG_FIND_QUIETLY) +endif() find_package(ZLIB ${_FIND_ZLIB_ARG}) if(ZLIB_FOUND) @@ -50,20 +50,20 @@ if(ZLIB_FOUND) if (CYGWIN) if(BUILD_SHARED_LIBS) # No need to define PNG_USE_DLL here, because it's default for Cygwin. - else(BUILD_SHARED_LIBS) + else() set (PNG_DEFINITIONS -DPNG_STATIC) - endif(BUILD_SHARED_LIBS) - endif (CYGWIN) + endif() + endif () - endif (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR) + endif () if (PNG_PNG_INCLUDE_DIR AND EXISTS "${PNG_PNG_INCLUDE_DIR}/png.h") file(STRINGS "${PNG_PNG_INCLUDE_DIR}/png.h" png_version_str REGEX "^#define[ \t]+PNG_LIBPNG_VER_STRING[ \t]+\".+\"") string(REGEX REPLACE "^#define[ \t]+PNG_LIBPNG_VER_STRING[ \t]+\"([^\"]+)\".*" "\\1" PNG_VERSION_STRING "${png_version_str}") unset(png_version_str) - endif (PNG_PNG_INCLUDE_DIR AND EXISTS "${PNG_PNG_INCLUDE_DIR}/png.h") -endif(ZLIB_FOUND) + endif () +endif() # handle the QUIETLY and REQUIRED arguments and set PNG_FOUND to TRUE if # all listed variables are TRUE |