andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cmake cleanup

Browse Source
This commit is contained in:
hathach
2021-04-19 13:30:04 +07:00
parent 27c4a7db8d
commit 59f0fa1e5e
18 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/device/audio_4_channel_mic/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

2
examples/device/audio_test/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

6
examples/device/board_test/CMakeLists.txt
View File

@@ -1,4 +1,6 @@
# use directory name for project id cmake_minimum_required(VERSION 3.5)
# use BOARD-Directory name for project id
get_filename_component(PROJECT ${CMAKE_CURRENT_SOURCE_DIR} NAME) get_filename_component(PROJECT ${CMAKE_CURRENT_SOURCE_DIR} NAME)
set(PROJECT ${BOARD}-${PROJECT}) set(PROJECT ${BOARD}-${PROJECT})
@@ -38,5 +40,5 @@ elseif(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

2
examples/device/cdc_dual_ports/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

11
examples/device/cdc_msc/CMakeLists.txt
View File

@@ -7,18 +7,13 @@ set(TOP "../../..")
get_filename_component(TOP "${TOP}" REALPATH) get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY MATCHES "^(esp32s[2-3])*") if(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.5)
include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
project(${PROJECT})
elseif(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
include(${TOP}/hw/bsp/${FAMILY}/pico_sdk_import.cmake) include(${TOP}/hw/bsp/${FAMILY}/pico_sdk_import.cmake)
project(${PROJECT}) project(${PROJECT})
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
# Example source # Example source
@@ -39,5 +34,5 @@ elseif(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

2
examples/device/cdc_msc_freertos/CMakeLists.txt
View File

@@ -10,6 +10,8 @@ get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY MATCHES "^esp32s[2-3]") if(FAMILY MATCHES "^esp32s[2-3]")
cmake_minimum_required(VERSION 3.5)
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
project(${PROJECT}) project(${PROJECT})

2
examples/device/dfu_runtime/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

2
examples/device/dynamic_configuration/CMakeLists.txt
View File

@@ -34,5 +34,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

2
examples/device/hid_composite/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

2
examples/device/hid_generic_inout/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

2
examples/device/hid_multiple_interface/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

2
examples/device/midi_test/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

2
examples/device/msc_dual_lun/CMakeLists.txt
View File

@@ -34,5 +34,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

2
examples/device/net_lwip_webserver/CMakeLists.txt
View File

@@ -80,5 +80,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

2
examples/device/uac2_headset/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

2
examples/device/usbtmc/CMakeLists.txt
View File

@@ -34,5 +34,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

2
examples/device/webusb_serial/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()

2
examples/host/cdc_msc_hid/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if(FAMILY STREQUAL "rp2040")
) )
else() else()
message(FATAL_ERROR "Invalid FAMILY specified") message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
endif() endif()