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 --- Modules/CMakeCInformation.cmake | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'Modules/CMakeCInformation.cmake') diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake index f0b7fe87bc..ce5ce44097 100644 --- a/Modules/CMakeCInformation.cmake +++ b/Modules/CMakeCInformation.cmake @@ -22,51 +22,51 @@ # so set the extension here first so it can be overridden by the compiler specific file if(UNIX) set(CMAKE_C_OUTPUT_EXTENSION .o) -else(UNIX) +else() set(CMAKE_C_OUTPUT_EXTENSION .obj) -endif(UNIX) +endif() set(_INCLUDED_FILE 0) # Load compiler-specific information. if(CMAKE_C_COMPILER_ID) include(Compiler/${CMAKE_C_COMPILER_ID}-C OPTIONAL) -endif(CMAKE_C_COMPILER_ID) +endif() set(CMAKE_BASE_NAME) get_filename_component(CMAKE_BASE_NAME ${CMAKE_C_COMPILER} NAME_WE) if(CMAKE_COMPILER_IS_GNUCC) set(CMAKE_BASE_NAME gcc) -endif(CMAKE_COMPILER_IS_GNUCC) +endif() # load a hardware specific file, mostly useful for embedded compilers if(CMAKE_SYSTEM_PROCESSOR) if(CMAKE_C_COMPILER_ID) include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-C-${CMAKE_SYSTEM_PROCESSOR} OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) - endif(CMAKE_C_COMPILER_ID) + endif() if (NOT _INCLUDED_FILE) include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}-${CMAKE_SYSTEM_PROCESSOR} OPTIONAL) - endif (NOT _INCLUDED_FILE) -endif(CMAKE_SYSTEM_PROCESSOR) + endif () +endif() # load the system- and compiler specific files if(CMAKE_C_COMPILER_ID) include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-C OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) -endif(CMAKE_C_COMPILER_ID) +endif() if (NOT _INCLUDED_FILE) include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) -endif (NOT _INCLUDED_FILE) +endif () # We specify the compiler information in the system file for some # platforms, but this language may not have been enabled when the file # was first included. Include it again to get the language info. # Remove this when all compiler info is removed from system files. if (NOT _INCLUDED_FILE) include(Platform/${CMAKE_SYSTEM_NAME} OPTIONAL) -endif (NOT _INCLUDED_FILE) +endif () if(CMAKE_C_SIZEOF_DATA_PTR) foreach(f ${CMAKE_C_ABI_FILES}) @@ -100,13 +100,13 @@ endif() if(NOT CMAKE_MODULE_EXISTS) set(CMAKE_SHARED_MODULE_C_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS}) set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS}) -endif(NOT CMAKE_MODULE_EXISTS) +endif() set(CMAKE_C_FLAGS_INIT "$ENV{CFLAGS} ${CMAKE_C_FLAGS_INIT}") # avoid just having a space as the initial value for the cache if(CMAKE_C_FLAGS_INIT STREQUAL " ") set(CMAKE_C_FLAGS_INIT) -endif(CMAKE_C_FLAGS_INIT STREQUAL " ") +endif() set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_INIT}" CACHE STRING "Flags used by the compiler during all build types.") @@ -115,7 +115,7 @@ if(NOT CMAKE_NOT_USING_CONFIG_FLAGS) if(NOT CMAKE_NO_BUILD_TYPE) set (CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE_INIT} CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") - endif(NOT CMAKE_NO_BUILD_TYPE) + endif() set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG_INIT}" CACHE STRING "Flags used by the compiler during debug builds.") set (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL_INIT}" CACHE STRING @@ -124,13 +124,13 @@ if(NOT CMAKE_NOT_USING_CONFIG_FLAGS) "Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).") set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING "Flags used by the compiler during Release with Debug Info builds.") -endif(NOT CMAKE_NOT_USING_CONFIG_FLAGS) +endif() if(CMAKE_C_STANDARD_LIBRARIES_INIT) set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES_INIT}" CACHE STRING "Libraries linked by defalut with all C applications.") mark_as_advanced(CMAKE_C_STANDARD_LIBRARIES) -endif(CMAKE_C_STANDARD_LIBRARIES_INIT) +endif() include(CMakeCommonLanguageInclude) @@ -165,12 +165,12 @@ include(CMakeCommonLanguageInclude) if(NOT CMAKE_C_CREATE_SHARED_LIBRARY) set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") -endif(NOT CMAKE_C_CREATE_SHARED_LIBRARY) +endif() # create a C shared module just copy the shared library rule if(NOT CMAKE_C_CREATE_SHARED_MODULE) set(CMAKE_C_CREATE_SHARED_MODULE ${CMAKE_C_CREATE_SHARED_LIBRARY}) -endif(NOT CMAKE_C_CREATE_SHARED_MODULE) +endif() # Create a static archive incrementally for large object file counts. # If CMAKE_C_CREATE_STATIC_LIBRARY is set it will override these. @@ -188,24 +188,24 @@ endif() if(NOT CMAKE_C_COMPILE_OBJECT) set(CMAKE_C_COMPILE_OBJECT " -o -c ") -endif(NOT CMAKE_C_COMPILE_OBJECT) +endif() if(NOT CMAKE_C_LINK_EXECUTABLE) set(CMAKE_C_LINK_EXECUTABLE " -o ") -endif(NOT CMAKE_C_LINK_EXECUTABLE) +endif() if(NOT CMAKE_EXECUTABLE_RUNTIME_C_FLAG) set(CMAKE_EXECUTABLE_RUNTIME_C_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG}) -endif(NOT CMAKE_EXECUTABLE_RUNTIME_C_FLAG) +endif() if(NOT CMAKE_EXECUTABLE_RUNTIME_C_FLAG_SEP) set(CMAKE_EXECUTABLE_RUNTIME_C_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP}) -endif(NOT CMAKE_EXECUTABLE_RUNTIME_C_FLAG_SEP) +endif() if(NOT CMAKE_EXECUTABLE_RPATH_LINK_C_FLAG) set(CMAKE_EXECUTABLE_RPATH_LINK_C_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG}) -endif(NOT CMAKE_EXECUTABLE_RPATH_LINK_C_FLAG) +endif() mark_as_advanced( CMAKE_C_FLAGS -- cgit v1.2.1