From 9db3116226cb99fcf54e936c833953abcde9b729 Mon Sep 17 00:00:00 2001 From: Kitware Robot Date: Mon, 13 Aug 2012 13:50:14 -0400 Subject: 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 --- CMakeCPackOptions.cmake.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'CMakeCPackOptions.cmake.in') diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in index 868331f14f..3a72eaa5ca 100644 --- a/CMakeCPackOptions.cmake.in +++ b/CMakeCPackOptions.cmake.in @@ -32,7 +32,7 @@ if(CPACK_GENERATOR MATCHES "NSIS") set(CPACK_NSIS_URL_INFO_ABOUT "http://www.kitware.com") set(CPACK_NSIS_CONTACT @CPACK_PACKAGE_CONTACT@) set(CPACK_NSIS_MODIFY_PATH ON) -endif(CPACK_GENERATOR MATCHES "NSIS") +endif() # include the cpack options for qt dialog if they exisit # they might not if qt was not enabled for the build @@ -42,12 +42,12 @@ if(CPACK_GENERATOR MATCHES "CygwinSource") # when packaging source make sure the .build directory is not included set(CPACK_SOURCE_IGNORE_FILES "/CVS/" "/\\.build/" "/\\.svn/" "\\.swp$" "\\.#" "/#" "~$") -endif(CPACK_GENERATOR MATCHES "CygwinSource") +endif() if("${CPACK_GENERATOR}" STREQUAL "PackageMaker") if(CMAKE_PACKAGE_QTGUI) set(CPACK_PACKAGE_DEFAULT_LOCATION "/Applications") - else(CMAKE_PACKAGE_QTGUI) + else() set(CPACK_PACKAGE_DEFAULT_LOCATION "/usr") - endif(CMAKE_PACKAGE_QTGUI) -endif("${CPACK_GENERATOR}" STREQUAL "PackageMaker") + endif() +endif() -- cgit v1.2.1