kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'bugfix/fix_idf_as_lib_build' into 'master'
Build: fix idf_as_lib example not building Closes IDFGH-6453 See merge request espressif/esp-idf!16514pull/8201/head
Zim Kalinowski
commit
779de561f4
|
|
@ -2,21 +2,24 @@ cmake_minimum_required(VERSION 3.5)
|
|||
|
||||
project(idf_as_lib C)
|
||||
|
||||
if("${TARGET}" STREQUAL "esp32")
|
||||
set(targets "esp32" "esp32s2" "esp32s3" "esp32c3" "esp32h2" "esp8684")
|
||||
|
||||
if("${TARGET}" IN_LIST targets)
|
||||
# Include for ESP-IDF build system functions
|
||||
include($ENV{IDF_PATH}/tools/cmake/idf.cmake)
|
||||
# Create idf::esp32 and idf::freertos static libraries
|
||||
idf_build_process(esp32
|
||||
# Create idf::{target} and idf::freertos static libraries
|
||||
idf_build_process("${TARGET}"
|
||||
# try and trim the build; additional components
|
||||
# will be included as needed based on dependency tree
|
||||
#
|
||||
# although esptool_py does not generate static library,
|
||||
# processing the component is needed for flashing related
|
||||
# targets and file generation
|
||||
COMPONENTS esp32 freertos esptool_py
|
||||
COMPONENTS "${TARGET}" freertos esptool_py
|
||||
SDKCONFIG ${CMAKE_CURRENT_LIST_DIR}/sdkconfig
|
||||
BUILD_DIR ${CMAKE_BINARY_DIR})
|
||||
else()
|
||||
message(WARNING "Unknown target ${TARGET}, creating stubs for esp32 instead")
|
||||
# Create stubs for esp32 and freertos, stub::esp32 and stub::freertos
|
||||
add_subdirectory(stubs/esp32)
|
||||
add_subdirectory(stubs/freertos)
|
||||
|
|
@ -29,8 +32,8 @@ set(elf_file ${CMAKE_PROJECT_NAME}.elf)
|
|||
add_executable(${elf_file} main.c)
|
||||
|
||||
# Link the static libraries to the executable
|
||||
if("${TARGET}" STREQUAL "esp32")
|
||||
target_link_libraries(${elf_file} idf::esp32 idf::freertos idf::spi_flash)
|
||||
if("${TARGET}" IN_LIST targets)
|
||||
target_link_libraries(${elf_file} "idf::${TARGET}" idf::freertos idf::spi_flash)
|
||||
# Attach additional targets to the executable file for flashing,
|
||||
# linker script generation, partition_table generation, etc.
|
||||
idf_build_executable(${elf_file})
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
rm -rf build && mkdir build && cd build
|
||||
cmake .. -DCMAKE_TOOLCHAIN_FILE=$IDF_PATH/tools/cmake/toolchain-esp32.cmake -DTARGET=esp32 -GNinja
|
||||
cmake --build .
|
||||
|
|
@ -0,0 +1 @@
|
|||
build.sh
|
||||
|
|
@ -0,0 +1 @@
|
|||
build.sh
|
||||
|
|
@ -0,0 +1 @@
|
|||
build.sh
|
||||
|
|
@ -0,0 +1 @@
|
|||
build.sh
|
||||
|
|
@ -0,0 +1 @@
|
|||
build.sh
|
||||
|
|
@ -0,0 +1 @@
|
|||
build.sh
|
||||
|
|
@ -1,4 +1,14 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# Retrive the target from the current filename, if no target specified,
|
||||
# the variable will be empty
|
||||
TARGET=$(echo $0 | cut -s -f2 -d- | cut -s -f1 -d.)
|
||||
if [[ -n $TARGET ]]
|
||||
then
|
||||
# Target is not null, specify the build parameters
|
||||
PARAM="-DCMAKE_TOOLCHAIN_FILE=$IDF_PATH/tools/cmake/toolchain-${TARGET}.cmake -DTARGET=${TARGET} -GNinja"
|
||||
fi
|
||||
|
||||
rm -rf build && mkdir build && cd build
|
||||
cmake ..
|
||||
cmake .. $PARAM
|
||||
cmake --build .
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
run-esp32.sh
|
||||
|
|
@ -0,0 +1 @@
|
|||
run-esp32.sh
|
||||
|
|
@ -0,0 +1 @@
|
|||
run-esp32.sh
|
||||
|
|
@ -0,0 +1 @@
|
|||
run-esp32.sh
|
||||
|
|
@ -0,0 +1 @@
|
|||
run-esp32.sh
|
||||
|
|
@ -0,0 +1 @@
|
|||
run-esp32.sh
|
||||
|
|
@ -26,8 +26,19 @@ components/spiffs/test_spiffsgen/test_spiffsgen.py
|
|||
components/ulp/esp32ulp_mapgen.py
|
||||
docs/check_lang_folder_sync.sh
|
||||
examples/build_system/cmake/idf_as_lib/build-esp32.sh
|
||||
examples/build_system/cmake/idf_as_lib/build-esp32c3.sh
|
||||
examples/build_system/cmake/idf_as_lib/build-esp32h2.sh
|
||||
examples/build_system/cmake/idf_as_lib/build-esp32s2.sh
|
||||
examples/build_system/cmake/idf_as_lib/build-esp32s3.sh
|
||||
examples/build_system/cmake/idf_as_lib/build-esp8684.sh
|
||||
examples/build_system/cmake/idf_as_lib/build.sh
|
||||
examples/build_system/cmake/idf_as_lib/run-esp32.sh
|
||||
examples/build_system/cmake/idf_as_lib/run-esp328684.sh
|
||||
examples/build_system/cmake/idf_as_lib/run-esp32c3.sh
|
||||
examples/build_system/cmake/idf_as_lib/run-esp32h2.sh
|
||||
examples/build_system/cmake/idf_as_lib/run-esp32s2.sh
|
||||
examples/build_system/cmake/idf_as_lib/run-esp32s3.sh
|
||||
examples/build_system/cmake/idf_as_lib/run-esp8684.sh
|
||||
examples/build_system/cmake/idf_as_lib/run.sh
|
||||
examples/storage/parttool/parttool_example.py
|
||||
examples/storage/parttool/parttool_example.sh
|
||||
|
|
|
|||
|
|
@ -13,6 +13,19 @@ set(CMAKE_OBJDUMP xtensa-esp32-elf-objdump)
|
|||
# -freestanding is a hack to force Clang to use its own stdatomic.h,
|
||||
# without falling back to the (incompatible) GCC stdatomic.h
|
||||
# https://github.com/espressif/llvm-project/blob/d9341b81/clang/lib/Headers/stdatomic.h#L13-L18
|
||||
list(APPEND c_compile_options "--target=xtensa" "-mcpu=esp32" "-ffreestanding")
|
||||
list(APPEND cxx_compile_options "--target=xtensa" "-mcpu=esp32" "-ffreestanding")
|
||||
list(APPEND asm_compile_options "--target=xtensa" "-mcpu=esp32")
|
||||
remove_duplicated_flags("--target=xtensa -mcpu=esp32 -ffreestanding ${CMAKE_C_FLAGS}"
|
||||
UNIQ_CMAKE_C_FLAGS)
|
||||
set(CMAKE_C_FLAGS "${UNIQ_CMAKE_C_FLAGS}"
|
||||
CACHE STRING "C Compiler Base Flags"
|
||||
FORCE)
|
||||
|
||||
remove_duplicated_flags("--target=xtensa -mcpu=esp32 -ffreestanding ${CMAKE_CXX_FLAGS}"
|
||||
UNIQ_CMAKE_CXX_FLAGS)
|
||||
set(CMAKE_CXX_FLAGS "${UNIQ_CMAKE_CXX_FLAGS}"
|
||||
CACHE STRING "C++ Compiler Base Flags"
|
||||
FORCE)
|
||||
|
||||
remove_duplicated_flags("--target=xtensa -mcpu=esp32 ${CMAKE_ASM_FLAGS}" UNIQ_CMAKE_ASM_FLAGS)
|
||||
set(CMAKE_ASM_FLAGS "${UNIQ_CMAKE_ASM_FLAGS}"
|
||||
CACHE STRING "Assembler Base Flags"
|
||||
FORCE)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
|
||||
|
||||
set(CMAKE_SYSTEM_NAME Generic)
|
||||
|
||||
set(CMAKE_C_COMPILER clang)
|
||||
|
|
@ -11,6 +13,20 @@ set(CMAKE_OBJDUMP xtensa-esp32-elf-objdump)
|
|||
# -freestanding is a hack to force Clang to use its own stdatomic.h,
|
||||
# without falling back to the (incompatible) GCC stdatomic.h
|
||||
# https://github.com/espressif/llvm-project/blob/d9341b81/clang/lib/Headers/stdatomic.h#L13-L18
|
||||
list(APPEND c_compile_options "--target=xtensa" "-mcpu=esp32s2" "-ffreestanding")
|
||||
list(APPEND cxx_compile_options "--target=xtensa" "-mcpu=esp32s2" "-ffreestanding")
|
||||
list(APPEND asm_compile_options "--target=xtensa" "-mcpu=esp32s2")
|
||||
remove_duplicated_flags("--target=xtensa -mcpu=esp32s2 -ffreestanding ${CMAKE_C_FLAGS}"
|
||||
UNIQ_CMAKE_C_FLAGS)
|
||||
set(CMAKE_C_FLAGS "${UNIQ_CMAKE_C_FLAGS}"
|
||||
CACHE STRING "C Compiler Base Flags"
|
||||
FORCE)
|
||||
|
||||
remove_duplicated_flags("--target=xtensa -mcpu=esp32s2 -ffreestanding ${CMAKE_CXX_FLAGS}"
|
||||
UNIQ_CMAKE_CXX_FLAGS)
|
||||
set(CMAKE_CXX_FLAGS "${UNIQ_CMAKE_CXX_FLAGS}"
|
||||
CACHE STRING "C++ Compiler Base Flags"
|
||||
FORCE)
|
||||
|
||||
remove_duplicated_flags("--target=xtensa -mcpu=esp32s2 ${CMAKE_ASM_FLAGS}"
|
||||
UNIQ_CMAKE_ASM_FLAGS)
|
||||
set(CMAKE_ASM_FLAGS "${UNIQ_CMAKE_ASM_FLAGS}"
|
||||
CACHE STRING "Assembler Base Flags"
|
||||
FORCE)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,13 @@
|
|||
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
|
||||
|
||||
set(CMAKE_SYSTEM_NAME Generic)
|
||||
|
||||
set(CMAKE_C_COMPILER xtensa-esp32-elf-gcc)
|
||||
set(CMAKE_CXX_COMPILER xtensa-esp32-elf-g++)
|
||||
set(CMAKE_ASM_COMPILER xtensa-esp32-elf-gcc)
|
||||
|
||||
list(APPEND compile_options "-mlongcalls" "-Wno-frame-address")
|
||||
|
||||
remove_duplicated_flags("-mlongcalls -Wno-frame-address ${CMAKE_C_FLAGS}" UNIQ_CMAKE_C_FLAGS)
|
||||
set(CMAKE_C_FLAGS "${UNIQ_CMAKE_C_FLAGS}" CACHE STRING "C Compiler Base Flags" FORCE)
|
||||
remove_duplicated_flags("-mlongcalls -Wno-frame-address ${CMAKE_CXX_FLAGS}" UNIQ_CMAKE_CXX_FLAGS)
|
||||
set(CMAKE_CXX_FLAGS "${UNIQ_CMAKE_CXX_FLAGS}" CACHE STRING "C++ Compiler Base Flags" FORCE)
|
||||
|
|
|
|||
|
|
@ -1,13 +1,19 @@
|
|||
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
|
||||
|
||||
set(CMAKE_SYSTEM_NAME Generic)
|
||||
|
||||
set(CMAKE_C_COMPILER riscv32-esp-elf-gcc)
|
||||
set(CMAKE_CXX_COMPILER riscv32-esp-elf-g++)
|
||||
set(CMAKE_ASM_COMPILER riscv32-esp-elf-gcc)
|
||||
|
||||
list(APPEND compile_options "-march=rv32imc")
|
||||
remove_duplicated_flags("-march=rv32imc ${CMAKE_C_FLAGS}"
|
||||
UNIQ_CMAKE_C_FLAGS)
|
||||
set(CMAKE_C_FLAGS "${UNIQ_CMAKE_C_FLAGS}" CACHE STRING "C Compiler Base Flags" FORCE)
|
||||
remove_duplicated_flags("-march=rv32imc ${CMAKE_CXX_FLAGS}"
|
||||
UNIQ_CMAKE_CXX_FLAGS)
|
||||
set(CMAKE_CXX_FLAGS "${UNIQ_CMAKE_CXX_FLAGS}" CACHE STRING "C++ Compiler Base Flags" FORCE)
|
||||
|
||||
# Option `--specs` must only be defined ONCE in the final linker command, else GCC will complain:
|
||||
# "attempt to rename spec 'link_gcc_c_sequence' to already defined spec 'nosys_link_gcc_c_sequence'"
|
||||
# so unset `link_options` first.
|
||||
unset(link_options)
|
||||
list(APPEND link_options "-nostartfiles" "-march=rv32imc" "--specs=nosys.specs")
|
||||
remove_duplicated_flags("-nostartfiles -march=rv32imc --specs=nosys.specs \
|
||||
${CMAKE_EXE_LINKER_FLAGS}"
|
||||
UNIQ_CMAKE_SAFE_EXE_LINKER_FLAGS)
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${UNIQ_CMAKE_SAFE_EXE_LINKER_FLAGS}" CACHE STRING "Linker Base Flags" FORCE)
|
||||
|
|
|
|||
|
|
@ -1,13 +1,17 @@
|
|||
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
|
||||
|
||||
set(CMAKE_SYSTEM_NAME Generic)
|
||||
|
||||
set(CMAKE_C_COMPILER riscv32-esp-elf-gcc)
|
||||
set(CMAKE_CXX_COMPILER riscv32-esp-elf-g++)
|
||||
set(CMAKE_ASM_COMPILER riscv32-esp-elf-gcc)
|
||||
|
||||
list(APPEND compile_options "-march=rv32imc")
|
||||
remove_duplicated_flags("-march=rv32imc ${CMAKE_C_FLAGS}" UNIQ_CMAKE_C_FLAGS)
|
||||
set(CMAKE_C_FLAGS "${UNIQ_CMAKE_C_FLAGS}" CACHE STRING "C Compiler Base Flags" FORCE)
|
||||
remove_duplicated_flags("-march=rv32imc ${CMAKE_CXX_FLAGS}" UNIQ_CMAKE_CXX_FLAGS)
|
||||
set(CMAKE_CXX_FLAGS "${UNIQ_CMAKE_CXX_FLAGS}" CACHE STRING "C++ Compiler Base Flags" FORCE)
|
||||
|
||||
# Option `--specs` must only be defined ONCE in the final linker command, else GCC will complain:
|
||||
# "attempt to rename spec 'link_gcc_c_sequence' to already defined spec 'nosys_link_gcc_c_sequence'"
|
||||
# so unset `link_options` first.
|
||||
unset(link_options)
|
||||
list(APPEND link_options "-nostartfiles" "-march=rv32imc" "--specs=nosys.specs")
|
||||
remove_duplicated_flags("-nostartfiles -march=rv32imc --specs=nosys.specs \
|
||||
${CMAKE_EXE_LINKER_FLAGS}"
|
||||
UNIQ_CMAKE_SAFE_EXE_LINKER_FLAGS)
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${UNIQ_CMAKE_SAFE_EXE_LINKER_FLAGS}" CACHE STRING "Linker Base Flags" FORCE)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,12 @@
|
|||
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
|
||||
|
||||
set(CMAKE_SYSTEM_NAME Generic)
|
||||
|
||||
set(CMAKE_C_COMPILER xtensa-esp32s2-elf-gcc)
|
||||
set(CMAKE_CXX_COMPILER xtensa-esp32s2-elf-g++)
|
||||
set(CMAKE_ASM_COMPILER xtensa-esp32s2-elf-gcc)
|
||||
|
||||
|
||||
list(APPEND compile_options "-mlongcalls")
|
||||
remove_duplicated_flags("-mlongcalls ${CMAKE_C_FLAGS}" UNIQ_CMAKE_C_FLAGS)
|
||||
set(CMAKE_C_FLAGS "${UNIQ_CMAKE_C_FLAGS}" CACHE STRING "C Compiler Base Flags" FORCE)
|
||||
remove_duplicated_flags("-mlongcalls ${CMAKE_CXX_FLAGS}" UNIQ_CMAKE_CXX_FLAGS)
|
||||
set(CMAKE_CXX_FLAGS "${UNIQ_CMAKE_CXX_FLAGS}" CACHE STRING "C++ Compiler Base Flags" FORCE)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,12 @@
|
|||
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
|
||||
|
||||
set(CMAKE_SYSTEM_NAME Generic)
|
||||
|
||||
set(CMAKE_C_COMPILER xtensa-esp32s3-elf-gcc)
|
||||
set(CMAKE_CXX_COMPILER xtensa-esp32s3-elf-g++)
|
||||
set(CMAKE_ASM_COMPILER xtensa-esp32s3-elf-gcc)
|
||||
|
||||
list(APPEND compile_options "-mlongcalls")
|
||||
remove_duplicated_flags("-mlongcalls ${CMAKE_C_FLAGS}" UNIQ_CMAKE_C_FLAGS)
|
||||
set(CMAKE_C_FLAGS "${UNIQ_CMAKE_C_FLAGS}" CACHE STRING "C Compiler Base Flags" FORCE)
|
||||
remove_duplicated_flags("-mlongcalls ${CMAKE_CXX_FLAGS}" UNIQ_CMAKE_CXX_FLAGS)
|
||||
set(CMAKE_CXX_FLAGS "${UNIQ_CMAKE_CXX_FLAGS}" CACHE STRING "C++ Compiler Base Flags" FORCE)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,17 @@
|
|||
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
|
||||
|
||||
set(CMAKE_SYSTEM_NAME Generic)
|
||||
|
||||
set(CMAKE_C_COMPILER riscv32-esp-elf-gcc)
|
||||
set(CMAKE_CXX_COMPILER riscv32-esp-elf-g++)
|
||||
set(CMAKE_ASM_COMPILER riscv32-esp-elf-gcc)
|
||||
|
||||
list(APPEND compile_options "-march=rv32imc")
|
||||
remove_duplicated_flags("-march=rv32imc ${CMAKE_C_FLAGS}" UNIQ_CMAKE_C_FLAGS)
|
||||
set(CMAKE_C_FLAGS "${UNIQ_CMAKE_C_FLAGS}" CACHE STRING "C Compiler Base Flags" FORCE)
|
||||
remove_duplicated_flags("-march=rv32imc ${CMAKE_CXX_FLAGS}" UNIQ_CMAKE_CXX_FLAGS)
|
||||
set(CMAKE_CXX_FLAGS "${UNIQ_CMAKE_CXX_FLAGS}" CACHE STRING "C++ Compiler Base Flags" FORCE)
|
||||
|
||||
remove_duplicated_flags("-nostartfiles -march=rv32imc --specs=nosys.specs \
|
||||
${CMAKE_EXE_LINKER_FLAGS}"
|
||||
UNIQ_CMAKE_SAFE_EXE_LINKER_FLAGS)
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${UNIQ_CMAKE_SAFE_EXE_LINKER_FLAGS}" CACHE STRING "Linker Base Flags" FORCE)
|
||||
|
|
|
|||
|
|
@ -364,3 +364,17 @@ function(add_deprecated_target_alias old_target new_target)
|
|||
)
|
||||
add_dependencies(${old_target} ${new_target})
|
||||
endfunction()
|
||||
|
||||
|
||||
# Remove duplicates from a string containing compilation flags
|
||||
function(remove_duplicated_flags FLAGS UNIQFLAGS)
|
||||
set(FLAGS_LIST "${FLAGS}")
|
||||
# Convert the given flags, as a string, into a CMake list type
|
||||
separate_arguments(FLAGS_LIST)
|
||||
# Remove all the duplicated flags
|
||||
list(REMOVE_DUPLICATES FLAGS_LIST)
|
||||
# Convert the list back to a string
|
||||
string(REPLACE ";" " " FLAGS_LIST "${FLAGS_LIST}")
|
||||
# Return that string to the caller
|
||||
set(${UNIQFLAGS} "${FLAGS_LIST}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue