@@ -9,25 +9,21 @@ set(CMAKE_CXX_STANDARD 17)
99include ($ENV{PICO_SDK_PATH} /external/pico_sdk_import.cmake)
1010
1111if (USB_CONSOLE)
12- set (PSHELL pshell_usb)
12+ set (PSHELL pshell_usb)
1313else ()
14- set (PSHELL pshell_uart)
14+ set (PSHELL pshell_uart)
1515endif ()
1616
1717project (${PSHELL} C CXX ASM)
1818
1919pico_sdk_init()
2020
21- if (PICO_SDK_VERSION_STRING VERSION_LESS "1.5.1" )
22- message (FATAL_ERROR "Raspberry Pi Pico SDK version 1.5.1 (or later) required." )
23- endif ()
24-
2521find_package (Git REQUIRED)
2622execute_process (
27- COMMAND git describe
28- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
29- OUTPUT_STRIP_TRAILING_WHITESPACE
30- OUTPUT_VARIABLE PSHELL_GIT_TAG
23+ COMMAND git describe
24+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
25+ OUTPUT_STRIP_TRAILING_WHITESPACE
26+ OUTPUT_VARIABLE PSHELL_GIT_TAG
3127)
3228
3329add_subdirectory (littlefs)
@@ -36,30 +32,30 @@ add_subdirectory(vi)
3632add_subdirectory (cc)
3733add_subdirectory (misc)
3834add_subdirectory (xymodem)
35+
3936if ("${PICO_BOARD} " STREQUAL "vgaboard" )
40- add_subdirectory (sdio)
37+ add_subdirectory (sdio)
4138else ()
42- add_subdirectory (flashio)
39+ add_subdirectory (flashio)
4340endif ()
4441
45-
4642add_executable (${PSHELL}
4743 shell.c
4844)
4945
5046target_compile_definitions (${PSHELL} PUBLIC
51- PICO_MALLOC_PANIC=0
52- PSHELL_GIT_TAG=\"${PSHELL_GIT_TAG} \"
47+ PICO_MALLOC_PANIC=0
48+ PSHELL_GIT_TAG=\"${PSHELL_GIT_TAG} \"
5349)
5450
5551if (FORCE_TESTS)
56- target_compile_definitions (${PSHELL} PUBLIC PSHELL_TESTS)
52+ target_compile_definitions (${PSHELL} PUBLIC PSHELL_TESTS)
5753endif ()
5854
5955if ("${PICO_BOARD} " STREQUAL "pico2" )
60- pico_set_linker_script(${PSHELL} ${CMAKE_CURRENT_LIST_DIR} /misc/pshell_2350.ld)
56+ pico_set_linker_script(${PSHELL} ${CMAKE_CURRENT_LIST_DIR} /misc/pshell_2350.ld)
6157else ()
62- pico_set_linker_script(${PSHELL} ${CMAKE_CURRENT_LIST_DIR} /misc/pshell_2040.ld)
58+ pico_set_linker_script(${PSHELL} ${CMAKE_CURRENT_LIST_DIR} /misc/pshell_2040.ld)
6359endif ()
6460
6561if (USB_CONSOLE)
7066 pico_enable_stdio_usb(${PSHELL} 0)
7167endif ()
7268
73- # pico_set_program_name(${PSHELL} "pshell")
74- # pico_set_program_version(${PSHELL} "${PSHELL_GIT_TAG}")
69+ pico_set_program_name(${PSHELL} "pshell" )
70+ pico_set_program_version(${PSHELL} "${PSHELL_GIT_TAG} " )
7571
7672target_link_libraries (${PSHELL} PUBLIC
7773 littlefs disassembler io vi cc misc xymodem
0 commit comments