diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ab593c..72edd5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,8 +19,7 @@ cmake_minimum_required( VERSION 3.16.3 ) project( toolchain-arm-none-eabi-gcc LANGUAGES C CXX -) + ) list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ) - include( openocd-utilities ) diff --git a/openocd-utilities.cmake b/openocd-utilities.cmake index d07e439..19b4156 100644 --- a/openocd-utilities.cmake +++ b/openocd-utilities.cmake @@ -81,13 +81,13 @@ function( add_openocd_target target ) "DEBUG_LEVEL" "COMMANDS;DEPENDS;FILES;SEARCH_PATH" ${ARGN} - ) + ) if( DEFINED add_openocd_target_UNPARSED_ARGUMENTS ) message( FATAL_ERROR "'${add_openocd_target_UNPARSED_ARGUMENTS}' are not supported arguments" - ) + ) endif( DEFINED add_openocd_target_UNPARSED_ARGUMENTS ) set( openocd_arguments "" ) @@ -129,7 +129,7 @@ function( add_openocd_target target ) COMMAND "${CMAKE_OPENOCD}" ${openocd_arguments} DEPENDS ${add_openocd_target_DEPENDS} VERBATIM - ) + ) endfunction( add_openocd_target ) # Add OpenOCD flash programming target for an executable. @@ -181,13 +181,13 @@ function( add_openocd_flash_programming_target executable ) "DEBUG_LEVEL" "COMMANDS;FILES;SEARCH_PATH" ${ARGN} - ) + ) if( DEFINED add_openocd_flash_programming_target_UNPARSED_ARGUMENTS ) message( FATAL_ERROR "'${add_openocd_flash_programming_target_UNPARSED_ARGUMENTS}' are not supported arguments" - ) + ) endif( DEFINED add_openocd_flash_programming_target_UNPARSED_ARGUMENTS ) add_openocd_target( @@ -201,5 +201,5 @@ function( add_openocd_flash_programming_target executable ) "telnet_port disabled" "program ${executable} verify reset" "shutdown" - ) + ) endfunction( add_openocd_flash_programming_target ) diff --git a/toolchain.cmake b/toolchain.cmake index 3e77816..bad7273 100644 --- a/toolchain.cmake +++ b/toolchain.cmake @@ -20,7 +20,7 @@ cmake_minimum_required( VERSION 3.16.3 ) mark_as_advanced( CMAKE_TOOLCHAIN_FILE CMAKE_INSTALL_PREFIX -) + ) set( CMAKE_SYSTEM_NAME "Generic" ) set( CMAKE_SYSTEM_PROCESSOR "Arm Cortex-M/Cortex-R" )