From 2829c76df1f7048c528f20de19d1bf780caceb38 Mon Sep 17 00:00:00 2001 From: matt on matebook Date: Tue, 19 Apr 2022 15:13:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3vscode=E4=B8=8Bcmake=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 第一个地方多一个空格，结果扫描到build目录了 第二个地方android怎么被定义了…… --- CMakeLists.txt | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b01255..866cb17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,8 +48,8 @@ include_sub_directories_recursively(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}) # 对 message(">>> CMAKE_SOURCE_DIR : ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}") -FILE(GLOB_RECURSE ${PROJECT_NAME}_SRC ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/ *.c) -FILE(GLOB_RECURSE ${PROJECT_NAME}_LIB ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/ *.lib) +FILE(GLOB_RECURSE ${PROJECT_NAME}_SRC ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/*.c) +FILE(GLOB_RECURSE ${PROJECT_NAME}_LIB ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/*.lib) list(REMOVE_ITEM ${PROJECT_NAME}_SRC "${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/otherFiles/hal_uart_out_wrapper.c") @@ -66,26 +66,14 @@ add_definitions(-DMAVLINK_USE_MESSAGE_INFO) add_definitions(-DCAPI_HAND="${PROJECT_NAME}_capi.h") add_definitions(-DSIL_HAND="${PROJECT_NAME}.h") -if(ANDROID) - add_library(${PROJECT_NAME} SHARED - main.cpp - mainwindow.cpp - mainwindow.h - mainwindow.ui - ${${PROJECT_NAME}_SRC} - ${${PROJECT_NAME}_LIB} - ) -else() - add_executable(${PROJECT_NAME} WIN32 +add_executable(${PROJECT_NAME} WIN32 mainwindow.cpp mainwindow.h mainwindow.ui main.cpp ${${PROJECT_NAME}_SRC} ${${PROJECT_NAME}_LIB} - ) - -endif() +) message(">>> ${PROJECT_NAME}_LIB : ${${PROJECT_NAME}_LIB}")