Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tools] 增加cmake生成工具 #4479

Merged
merged 4 commits into from
Apr 10, 2021
Merged

[tools] 增加cmake生成工具 #4479

merged 4 commits into from
Apr 10, 2021

Conversation

mysterywolf
Copy link
Member

拉取/合并请求描述:(PR description)

[
原作者:https://github.com//pull/2685/
重新进行了提交,民心所向。
]

以下的内容不应该在提交PR时的message修改,修改下述message,PR会被直接关闭。请在提交PR后,浏览器查看PR并对以下检查项逐项check,没问题后逐条在页面上打钩。
The following content must not be changed in the submitted PR message. Otherwise, the PR will be closed immediately. After submitted PR, please use a web browser to visit PR, and check items one by one, and ticked them if no problem.

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确,包括缩进空格,命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码,代码尽量精简,不包含#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 本拉取/合并请求代码是高质量的 Code in this PR is of high quality

@armink
Copy link
Member

armink commented Apr 9, 2021

@BernardXiong 熊大,cmake 这块需要我们这边测试下再合并进去吗?

@mysterywolf
Copy link
Member Author

mysterywolf commented Apr 9, 2021

合并的话 建议reopen原作者的 合并他。的我的只不过是盗版他的的。#2685

@armink
Copy link
Member

armink commented Apr 9, 2021

好的,你那边验证过了吗?

@mysterywolf
Copy link
Member Author

没有验证 之前群里有些人嚷嚷着要cmake 我就重新提上来了 需要验证,cmake这块我并不熟悉

@armink
Copy link
Member

armink commented Apr 9, 2021

好的,那我们这边验证一下

@liukangcc liukangcc added the +1 Agree +1 label Apr 10, 2021
@liukangcc
Copy link
Member

liukang@liukang-virtual-machine:~/test/rt-thread/bsp/stm32/stm32l475-atk-pandora$ scons --target=cmake
scons: Reading SConscript files ...
Update setting files for CMakeLists.txt...
Done!
scons: done reading SConscript files.
scons: Building targets ...
scons: building associated VariantDir targets: build
CC build/applications/main.o
CC build/board/CubeMX_Config/Src/stm32l4xx_hal_msp.o
CC build/board/board.o
CC build/kernel/components/drivers/misc/pin.o
CC build/kernel/components/drivers/serial/serial.o
CC build/kernel/components/drivers/src/completion.o
CC build/kernel/components/drivers/src/dataqueue.o
CC build/kernel/components/drivers/src/pipe.o
CC build/kernel/components/drivers/src/ringblk_buf.o
CC build/kernel/components/drivers/src/ringbuffer.o
CC build/kernel/components/drivers/src/waitqueue.o
CC build/kernel/components/drivers/src/workqueue.o
CC build/kernel/components/finsh/cmd.o
CC build/kernel/components/finsh/msh.o
CC build/kernel/components/finsh/shell.o
CC build/kernel/components/libc/compilers/common/time.o
CC build/kernel/components/libc/compilers/newlib/minilib.o
CC build/kernel/libcpu/arm/common/backtrace.o
CC build/kernel/libcpu/arm/common/div0.o
CC build/kernel/libcpu/arm/common/showmem.o
AS build/kernel/libcpu/arm/cortex-m4/context_gcc.o
CC build/kernel/libcpu/arm/cortex-m4/cpuport.o
CC build/kernel/src/clock.o
CC build/kernel/src/components.o
CC build/kernel/src/device.o
CC build/kernel/src/idle.o
CC build/kernel/src/ipc.o
CC build/kernel/src/irq.o
CC build/kernel/src/kservice.o
CC build/kernel/src/mem.o
CC build/kernel/src/mempool.o
CC build/kernel/src/object.o
CC build/kernel/src/scheduler.o
CC build/kernel/src/thread.o
CC build/kernel/src/timer.o
AS /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l475xx.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rng.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/system_stm32l4xx.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_comp.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cryp.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cryp_ex.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_usart_ex.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc_ex.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_usart.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/HAL_Drivers/drv_common.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/HAL_Drivers/drv_usart.o
CC /home/liukang/test/rt-thread/bsp/stm32/libraries/HAL_Drivers/drv_gpio.o
LINK rt-thread.elf
arm-none-eabi-objcopy -O binary rt-thread.elf rtthread.bin
arm-none-eabi-size rt-thread.elf
scons: done building targets.
liukang@liukang-virtual-machine:~/test/rt-thread/bsp/stm32/stm32l475-atk-pandora$ cd build/
liukang@liukang-virtual-machine:~/test/rt-thread/bsp/stm32/stm32l475-atk-pandora/build$ cmake ..
-- The C compiler identification is GNU 9.3.0
-- The ASM compiler identification is GNU
-- Found assembler: /usr/bin/cc
-- Check for working C compiler: /usr/bin/cc
-- Check for working C compiler: /usr/bin/cc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Detecting C compile features
-- Detecting C compile features - done
-- Configuring done
-- Generating done
-- Build files have been written to: /home/liukang/test/rt-thread/bsp/stm32/stm32l475-atk-pandora/build
liukang@liukang-virtual-machine:~/test/rt-thread/bsp/stm32/stm32l475-atk-pandora/build$ make
Scanning dependencies of target rtthread.elf
[  1%] Building C object CMakeFiles/rtthread.elf.dir/applications/main.c.o
[  3%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/libcpu/arm/common/backtrace.c.o
[  4%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/libcpu/arm/common/showmem.c.o
[  6%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/libcpu/arm/common/div0.c.o
[  8%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/libcpu/arm/cortex-m4/cpuport.c.o
[  9%] Building ASM object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/libcpu/arm/cortex-m4/context_gcc.S.o
[ 11%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/components/drivers/serial/serial.c.o
[ 13%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/components/drivers/src/completion.c.o
[ 14%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/components/drivers/src/waitqueue.c.o
[ 16%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/components/drivers/src/dataqueue.c.o
[ 18%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/components/drivers/src/workqueue.c.o
[ 19%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/components/drivers/src/pipe.c.o
[ 21%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/components/drivers/src/ringblk_buf.c.o
[ 22%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/components/drivers/src/ringbuffer.c.o
[ 24%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/components/drivers/misc/pin.c.o
[ 26%] Building C object CMakeFiles/rtthread.elf.dir/board/board.c.o
[ 27%] Building C object CMakeFiles/rtthread.elf.dir/board/CubeMX_Config/Src/stm32l4xx_hal_msp.c.o
[ 29%] Building ASM object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l475xx.s.o
[ 31%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/HAL_Drivers/drv_common.c.o
[ 32%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/HAL_Drivers/drv_usart.c.o
[ 34%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/HAL_Drivers/drv_gpio.c.o
[ 36%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/components/finsh/msh.c.o
[ 37%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/components/finsh/cmd.c.o
[ 39%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/components/finsh/shell.c.o
[ 40%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/src/device.c.o
[ 42%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/src/kservice.c.o
[ 44%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/src/clock.c.o
[ 45%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/src/mem.c.o
[ 47%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/src/idle.c.o
[ 49%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/src/components.c.o
[ 50%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/src/thread.c.o
[ 52%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/src/irq.c.o
[ 54%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/src/object.c.o
[ 55%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/src/scheduler.c.o
[ 57%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/src/timer.c.o
[ 59%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/src/ipc.c.o
[ 60%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/src/mempool.c.o
[ 62%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/components/libc/compilers/newlib/minilib.c.o
[ 63%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/components/libc/compilers/common/time.c.o
[ 65%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rng.c.o
[ 67%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.c.o
[ 68%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.c.o
[ 70%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.c.o
[ 72%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.c.o
[ 73%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/system_stm32l4xx.c.o
[ 75%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_comp.c.o
[ 77%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.c.o
[ 78%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cryp.c.o
[ 80%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cryp_ex.c.o
[ 81%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.c.o
[ 83%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_usart_ex.c.o
[ 85%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.c.o
[ 86%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.c.o
[ 88%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.c.o
[ 90%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc_ex.c.o
[ 91%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.c.o
[ 93%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_usart.c.o
[ 95%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc.c.o
[ 96%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.c.o
[ 98%] Building C object CMakeFiles/rtthread.elf.dir/home/liukang/test/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.c.o
[100%] Linking C executable rtthread.elf
   text	   data	    bss	    dec	    hex	filename
  63732	   1432	   2372	  67536	  107d0	rtthread.elf
[100%] Built target rtthread.elf

@Guozhanxin Guozhanxin added +2 Agree +2 +1 Agree +1 and removed +1 Agree +1 labels Apr 10, 2021
@mysterywolf
Copy link
Member Author

mysterywolf commented Apr 10, 2021

关闭本pr 并reopen #2685 合并它 @BernardXiong ,这两个pr是一致的,请合并原作者的

@Guozhanxin
Copy link
Member

关闭本pr 并reopen #2685 合并它 @BernardXiong ,这两个pr是一致的,请合并原作者的

原作者的没法打开了,分支都没有了

@armink
Copy link
Member

armink commented Apr 10, 2021

@mysterywolf
Copy link
Member Author

如果有困难的话 就合并我的

@armink
Copy link
Member

armink commented Apr 10, 2021

摘取原作者的 提交内容 过来可以吗?或者在源码中添加作者的版权信息

@mysterywolf
Copy link
Member Author

摘取原作者的 提交内容 过来可以吗?或者在源码中添加作者的版权信息

我直接加版权信息吧

@BernardXiong BernardXiong merged commit 9235b62 into RT-Thread:master Apr 10, 2021
@BernardXiong
Copy link
Member

我估计还存在一些问题,例如一些Group中加入了local cflags等之类的

@mysterywolf mysterywolf deleted the cmake branch April 10, 2021 16:06
@Guozhanxin
Copy link
Member

还有一个问题,就是 c++ 以及 lib 相关的配置项没同步过来

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
+1 Agree +1 +2 Agree +2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants