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/Platform/Generic-ADSP-Common.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/Platform/Generic-ADSP-Common.cmake')
-rw-r--r-- | Modules/Platform/Generic-ADSP-Common.cmake | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/Modules/Platform/Generic-ADSP-Common.cmake b/Modules/Platform/Generic-ADSP-Common.cmake index 9120eed..026f83c 100644 --- a/Modules/Platform/Generic-ADSP-Common.cmake +++ b/Modules/Platform/Generic-ADSP-Common.cmake @@ -18,66 +18,66 @@ if(NOT ADSP) # assume that this is the processor name to use for the compiler if(CMAKE_SYSTEM_PROCESSOR AND NOT ADSP_PROCESSOR) set(ADSP_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}) - endif(CMAKE_SYSTEM_PROCESSOR AND NOT ADSP_PROCESSOR) + endif() # if ADSP_PROCESSOR_SILICIUM_REVISION has not been set, use "none" if(NOT ADSP_PROCESSOR_SILICIUM_REVISION) set(ADSP_PROCESSOR_SILICIUM_REVISION "none") - endif(NOT ADSP_PROCESSOR_SILICIUM_REVISION) + endif() # this file is included from the C and CXX files, so handle both here get_filename_component(_ADSP_DIR "${CMAKE_C_COMPILER}" PATH) if(NOT _ADSP_DIR) get_filename_component(_ADSP_DIR "${CMAKE_CXX_COMPILER}" PATH) - endif(NOT _ADSP_DIR) + endif() if(NOT _ADSP_DIR) get_filename_component(_ADSP_DIR "${CMAKE_ASM_COMPILER}" PATH) - endif(NOT _ADSP_DIR) + endif() # detect architecture if(CMAKE_C_COMPILER MATCHES ccblkfn OR CMAKE_CXX_COMPILER MATCHES ccblkfn OR CMAKE_ASM_COMPILER MATCHES easmBLKFN) if(NOT ADSP_PROCESSOR) set(ADSP_PROCESSOR "ADSP-BF561") - endif(NOT ADSP_PROCESSOR) + endif() set(ADSP_BLACKFIN TRUE) set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/Blackfin") - endif(CMAKE_C_COMPILER MATCHES ccblkfn OR CMAKE_CXX_COMPILER MATCHES ccblkfn OR CMAKE_ASM_COMPILER MATCHES easmBLKFN) + endif() if(CMAKE_C_COMPILER MATCHES ccts OR CMAKE_CXX_COMPILER MATCHES ccts OR CMAKE_ASM_COMPILER MATCHES easmTS) if(NOT ADSP_PROCESSOR) set(ADSP_PROCESSOR "ADSP-TS101") - endif(NOT ADSP_PROCESSOR) + endif() set(ADSP_TS TRUE) set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/TS") - endif(CMAKE_C_COMPILER MATCHES ccts OR CMAKE_CXX_COMPILER MATCHES ccts OR CMAKE_ASM_COMPILER MATCHES easmTS) + endif() if(CMAKE_C_COMPILER MATCHES cc21k OR CMAKE_CXX_COMPILER MATCHES cc21k OR CMAKE_ASM_COMPILER MATCHES easm21k) if(NOT ADSP_PROCESSOR) set(ADSP_PROCESSOR "ADSP-21060") - endif(NOT ADSP_PROCESSOR) + endif() set(ADSP_21K TRUE) set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/21k") # default if nothing matches if (ADSP_PROCESSOR MATCHES "210..$") set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/21k") - endif(ADSP_PROCESSOR MATCHES "210..$") + endif() if (ADSP_PROCESSOR MATCHES "211..$") set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/211k") - endif(ADSP_PROCESSOR MATCHES "211..$") + endif() if (ADSP_PROCESSOR MATCHES "212..$") set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/212k") - endif(ADSP_PROCESSOR MATCHES "212..$") + endif() if (ADSP_PROCESSOR MATCHES "213..$") set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/213k") - endif(ADSP_PROCESSOR MATCHES "213..$") + endif() set(_ADSP_FAMILY_DIR "${_ADSP_DIR}/21k") - endif(CMAKE_C_COMPILER MATCHES cc21k OR CMAKE_CXX_COMPILER MATCHES cc21k OR CMAKE_ASM_COMPILER MATCHES easm21k) + endif() link_directories("${_ADSP_FAMILY_DIR}/lib") @@ -91,7 +91,7 @@ if(NOT ADSP) COMMAND ${ADSP_VDKGEN_EXECUTABLE} ${VDK_KERNEL_SUPPORT_FILE} -proc ${ADSP_PROCESSOR} -si-revision ${ADSP_PROCESSOR_SILICIUM_REVISION} -MM DEPENDS ${VDK_KERNEL_SUPPORT_FILE} ) - endmacro(ADSP_GENERATE_VDK VDK_GENERATED_HEADER VDK_GENERATED_SOURCE VDK_KERNEL_SUPPORT_FILE) + endmacro() # loader support find_program( ADSP_ELFLOADER_EXECUTABLE elfloader "${_ADSP_FAMILY_DIR}" ) @@ -106,7 +106,7 @@ if(NOT ADSP) COMMAND ${ADSP_ELFLOADER_EXECUTABLE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}.dxe -proc ${ADSP_PROCESSOR} -si-revision ${ADSP_PROCESSOR_SILICIUM_REVISION} -b ${BOOT_MODE} -f ${FORMAT} -width ${WIDTH} -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}.ldr COMMENT "Building the loader file" ) - endmacro(ADSP_CREATE_LOADER_FILE TARGET_NAME BOOT_MODE FORMAT WIDTH) + endmacro() macro(ADSP_CREATE_LOADER_FILE_INIT TARGET_NAME BOOT_MODE FORMAT WIDTH INITIALIZATION_FILE) add_custom_command( @@ -115,6 +115,6 @@ if(NOT ADSP) COMMAND ${ADSP_ELFLOADER_EXECUTABLE} ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}.dxe -proc ${ADSP_PROCESSOR} -si-revision ${ADSP_PROCESSOR_SILICIUM_REVISION} -b ${BOOT_MODE} -f ${FORMAT} -width ${WIDTH} -o ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}.ldr -init ${INITIALIZATION_FILE} COMMENT "Building the loader file" ) - endmacro(ADSP_CREATE_LOADER_FILE_INIT TARGET_NAME BOOT_MODE FORMAT WIDTH INITIALIZATION_FILE) + endmacro() -endif(NOT ADSP) +endif() |