Skip to content

Commit 716542d

Browse files
SebastianBoeSebastianBoe
authored
Merge pull request #5 from nashif/cmake_anas5
More cmake related changes
2 parents 9aff0fc + 8dffa8c commit 716542d

File tree

12 files changed

+57
-43
lines changed

12 files changed

+57
-43
lines changed

‎.shippable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ compiler: gcc
55
env:
66
global:
77
- SDK=0.9.1
8-
- SANITYCHECK_OPTIONS=" --inline-logs -R -p nrf52_pca10040 -T samples/bluetooth/"
8+
- SANITYCHECK_OPTIONS=" --inline-logs -R -p nrf52_pca10040 -p qemu_cortex_m3 -p qemu_x86_iamcu -p qemu_x86 -p arduino_101"
99
- SANITYCHECK_OPTIONS_RETRY="${SANITYCHECK_OPTIONS} --only-failed --outdir=out-2nd-pass"
1010
- ZEPHYR_SDK_INSTALL_DIR=/opt/sdk/zephyr-sdk-0.9.1
1111
- ZEPHYR_GCC_VARIANT=zephyr

‎arch/arm/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ if(CONFIG_FLOAT)
4242
set(FPU_FOR_cortex-m4 fpv4-sp-d16)
4343
set(FPU_FOR_cortex-m7 fpv5-d16)
4444
set(FPU_FOR_cortex-m33 fpv5-d16)
45-
target_cc_options(zephyr PUBLIC -mfpu=${FPU_FOR_${GCC_M_CPU}})
45+
target_cc_option(zephyr PUBLIC -mfpu=${FPU_FOR_${GCC_M_CPU}})
4646

4747
if (CONFIG_FP_SOFTABI)
4848
target_cc_option(zephyr PUBLIC -mfloat-abi=soft)

‎boards/x86/arduino_101/CMakeLists.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
zephyr_library()
2-
zephyr_library_sources(${CMAKE_CURRENT_SOURCE_DIR}/pinmux.c)
3-
target_link_libraries(boards__x86__arduino_101 zephyr drivers__pinmux)
4-
target_include_directories(boards__x86__arduino_101 PRIVATE
5-
${PROJECT_SOURCE_DIR}/include
2+
zephyr_library_sources(pinmux.c)
3+
4+
5+
zephyr_library_include_directories(PRIVATE
66
${PROJECT_SOURCE_DIR}/drivers
7-
${PROJECT_SOURCE_DIR}/drivers/pinmux
87
)

‎boards/x86/quark_d2000_crb/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
zephyr_sources(pinmux.c)
2+
zephyr_library_include_directories(PRIVATE ${PROJECT_SOURCE_DIR}/drivers)

‎cmake/extensions.cmake

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ endfunction()
5252

5353
function(target_cc_option_ifdef feature_toggle target scope option)
5454
if(${feature_toggle})
55-
target_cc_options(${target} ${scope} ${option})
55+
target_cc_option(${target} ${scope} ${option})
5656
endif()
5757
endfunction()
5858

@@ -68,6 +68,12 @@ function(zephyr_library_sources_ifdef feature_toggle source)
6868
endif()
6969
endfunction()
7070

71+
function(zephyr_library_sources_if_kconfig item)
72+
get_filename_component(item_basename ${item} NAME_WE)
73+
string(TOUPPER CONFIG_${item_basename} UPPER_CASE_CONFIG)
74+
zephyr_library_sources_ifdef(${UPPER_CASE_CONFIG} ${item})
75+
endfunction()
76+
7177
function(zephyr_sources_if_kconfig item)
7278
get_filename_component(item_basename ${item} NAME_WE)
7379
string(TOUPPER CONFIG_${item_basename} UPPER_CASE_CONFIG)

‎drivers/console/CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
zephyr_library()
22

3-
target_sources_if_kconfig(drivers__console PRIVATE uart_console.c)
4-
target_sources_if_kconfig(drivers__console PRIVATE ram_console.c)
5-
target_sources_if_kconfig(drivers__console PRIVATE rtt_console.c)
6-
target_sources_if_kconfig(drivers__console PRIVATE ipm_console_receiver.c)
7-
target_sources_if_kconfig(drivers__console PRIVATE ipm_console_sender.c)
8-
target_sources_if_kconfig(drivers__console PRIVATE uart_pipe.c)
9-
target_sources_if_kconfig(drivers__console PRIVATE telnet_console.c)
10-
target_sources_if_kconfig(drivers__console PRIVATE xtensa_sim_console.c)
3+
zephyr_library_sources_if_kconfig(uart_console.c)
4+
zephyr_library_sources_if_kconfig(ram_console.c)
5+
zephyr_library_sources_if_kconfig(rtt_console.c)
6+
zephyr_library_sources_if_kconfig(ipm_console_receiver.c)
7+
zephyr_library_sources_if_kconfig(ipm_console_sender.c)
8+
zephyr_library_sources_if_kconfig(uart_pipe.c)
9+
zephyr_library_sources_if_kconfig(telnet_console.c)
10+
zephyr_library_sources_if_kconfig(xtensa_sim_console.c)
1111

12-
target_link_libraries(drivers__console drivers)
12+
zephyr_library_link_libraries(drivers)

‎drivers/serial/CMakeLists.txt

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
zephyr_library()
2-
target_link_libraries(drivers__serial drivers)
32

4-
target_sources_if_kconfig(drivers__serial PRIVATE uart_ns16550.c)
5-
target_sources_if_kconfig(drivers__serial PRIVATE uart_mcux.c)
6-
target_sources_if_kconfig(drivers__serial PRIVATE uart_mcux_lpuart.c)
7-
target_sources_if_kconfig(drivers__serial PRIVATE uart_stellaris.c)
8-
target_sources_if_kconfig(drivers__serial PRIVATE uart_nsim.c)
9-
target_sources_if_kconfig(drivers__serial PRIVATE uart_atmel_sam3.c)
10-
target_sources_if_kconfig(drivers__serial PRIVATE uart_sam.c)
11-
target_sources_if_kconfig(drivers__serial PRIVATE uart_qmsi.c)
12-
target_sources_if_kconfig(drivers__serial PRIVATE uart_stm32.c)
13-
target_sources_if_kconfig(drivers__serial PRIVATE uart_nrf5.c)
14-
target_sources_if_kconfig(drivers__serial PRIVATE uart_altera_jtag.c)
15-
target_sources_if_kconfig(drivers__serial PRIVATE uart_cc32.c)
16-
target_sources_if_kconfig(drivers__serial PRIVATE uart_cmsdk_apb.c)
17-
target_sources_if_kconfig(drivers__serial PRIVATE uart_riscv_qemu.c)
3+
zephyr_library_link_libraries(drivers)
4+
5+
zephyr_library_sources_if_kconfig(uart_ns16550.c)
6+
zephyr_library_sources_if_kconfig(uart_mcux.c)
7+
zephyr_library_sources_if_kconfig(uart_mcux_lpuart.c)
8+
zephyr_library_sources_if_kconfig(uart_stellaris.c)
9+
zephyr_library_sources_if_kconfig(uart_nsim.c)
10+
zephyr_library_sources_if_kconfig(uart_atmel_sam3.c)
11+
zephyr_library_sources_if_kconfig(uart_sam.c)
12+
zephyr_library_sources_if_kconfig(uart_qmsi.c)
13+
zephyr_library_sources_if_kconfig(uart_stm32.c)
14+
zephyr_library_sources_if_kconfig(uart_nrf5.c)
15+
zephyr_library_sources_if_kconfig(uart_altera_jtag.c)
16+
zephyr_library_sources_if_kconfig(uart_cc32.c)
17+
zephyr_library_sources_if_kconfig(uart_cmsdk_apb.c)
18+
zephyr_library_sources_if_kconfig(uart_riscv_qemu.c)

‎drivers/timer/CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ zephyr_library()
22

33
zephyr_library_sources(sys_clock_init.c)
44

5-
target_sources_ifdef(CONFIG_HPET_TIMER drivers__timer PRIVATE hpet.c)
6-
target_sources_ifdef(CONFIG_ARCV2_TIMER drivers__timer PRIVATE arcv2_timer0.c)
5+
zephyr_library_sources_ifdef(CONFIG_HPET_TIMER hpet.c)
6+
zephyr_library_sources_ifdef(CONFIG_ARCV2_TIMER arcv2_timer0.c)
77

8-
target_sources_if_kconfig( drivers__timer PRIVATE loapic_timer.c)
9-
target_sources_if_kconfig( drivers__timer PRIVATE altera_avalon_timer.c)
10-
target_sources_if_kconfig( drivers__timer PRIVATE nrf_rtc_timer.c)
11-
target_sources_if_kconfig( drivers__timer PRIVATE pulpino_timer.c)
12-
target_sources_if_kconfig( drivers__timer PRIVATE riscv_machine_timer.c)
13-
target_sources_if_kconfig( drivers__timer PRIVATE cortex_m_systick.c)
8+
zephyr_library_sources_if_kconfig(loapic_timer.c)
9+
zephyr_library_sources_if_kconfig(altera_avalon_timer.c)
10+
zephyr_library_sources_if_kconfig(nrf_rtc_timer.c)
11+
zephyr_library_sources_if_kconfig(pulpino_timer.c)
12+
zephyr_library_sources_if_kconfig(riscv_machine_timer.c)
13+
zephyr_library_sources_if_kconfig(cortex_m_systick.c)
1414

15-
target_link_libraries(drivers__timer drivers)
15+
zephyr_library_link_libraries(drivers)

‎lib/libc/minimal/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
target_sources(zephyr PRIVATE
1+
target_sources(app PRIVATE
22
${CMAKE_CURRENT_SOURCE_DIR}/source/stdlib/atoi.c
33
${CMAKE_CURRENT_SOURCE_DIR}/source/stdlib/strtol.c
44
${CMAKE_CURRENT_SOURCE_DIR}/source/stdlib/strtoul.c
@@ -10,7 +10,7 @@ target_sources(zephyr PRIVATE
1010
${CMAKE_CURRENT_SOURCE_DIR}/source/stdout/sprintf.c
1111
${CMAKE_CURRENT_SOURCE_DIR}/source/stdout/fprintf.c
1212
)
13-
target_include_directories(zephyr
13+
target_include_directories(app
1414
PUBLIC
1515
include
1616
)

‎scripts/sanitycheck

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,6 +1277,9 @@ class TestSuite:
12771277
for dirpath, dirnames, filenames in os.walk(testcase_root,
12781278
topdown=True):
12791279
verbose("scanning %s" % dirpath)
1280+
# FIXME: To only run on ported tests and samples when migrating to cmake
1281+
if 'CMakeLists.txt' not in filenames:
1282+
continue
12801283
if 'sample.yaml' in filenames:
12811284
filename = 'sample.yaml'
12821285
elif 'testcase.yaml' in filenames:

0 commit comments

Comments
 (0)