From 5a32ce8bb97b228fdbff6f2522cf1076935b7d36 Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Tue, 27 Dec 2022 12:58:56 +0100 Subject: [PATCH] code cleanup --- CMakeLists.txt | 24 ------------------------ src/CMakeLists.txt | 11 +++++------ 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e13695..38e1988 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,34 +18,10 @@ if (PICO_SDK_VERSION_STRING VERSION_LESS "1.4.0") message(FATAL_ERROR "Raspberry Pi Pico SDK version 1.4.0 (or later) required. Your version is ${PICO_SDK_VERSION_STRING}") endif() -#project(abfall C CXX ASM) project(abfall VERSION "1.0.0" LANGUAGES C CXX ASM) - # Initialise the Raspberry Pi Pico SDK pico_sdk_init() - -# Add executable. Default name is the project name, version 0.1 - -# add_executable(abfall abfall.cpp ) - -# Add the standard library to the build -#target_link_libraries(abfall -# pico_stdlib) - -# Add the standard include files to the build -#target_include_directories(abfall PRIVATE -# ${CMAKE_CURRENT_LIST_DIR} -# ${CMAKE_CURRENT_LIST_DIR}/.. # for our common lwipopts or any other standard includes, if required -#) - -# Add any user requested libraries -#target_link_libraries(abfall -# pico_cyw43_arch_lwip_threadsafe_background -# ) - -#pico_add_extra_outputs(abfall) - add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 60207e1..ce11f1c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,8 @@ -set(CMAKE_INCLUDE_CURRENT_DIR ON) +#set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - abfall.cpp) + abfall.cpp +) add_executable(${CMAKE_PROJECT_NAME} ${SOURCES}) @@ -24,11 +25,9 @@ set_target_properties(${CMAKE_PROJECT_NAME} pico_enable_stdio_uart(${CMAKE_PROJECT_NAME} 1) pico_enable_stdio_usb(${CMAKE_PROJECT_NAME} 0) - - target_link_libraries(${CMAKE_PROJECT_NAME} - pico_stdlib - pico_cyw43_arch_lwip_threadsafe_background + pico_stdlib + pico_cyw43_arch_lwip_threadsafe_background ) pico_add_extra_outputs(${CMAKE_PROJECT_NAME})