修正vscode下cmake错误
第一个地方多一个空格,结果扫描到build目录了 第二个地方android怎么被定义了……
This commit is contained in:
+4
-16
@@ -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}")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user