Skip to content

Q
qgroundcontrol
Commit a76dc8c2 authored by Tomaz Canabrava's avatar Tomaz Canabrava Committed by Daniel Agar
Browse files
Options

Spaces vs Tabs

parent fe327d49
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
CMakeLists.txt
View file @ a76dc8c2
...@@ -103,7 +103,7 @@ find_package(Qt5 ${QT_VERSION} ...@@ -103,7 +103,7 @@ find_package(Qt5 ${QT_VERSION}
Xml Xml
REQUIRED REQUIRED
HINTS HINTS
${QT_LIBRARY_HINTS} ${QT_LIBRARY_HINTS}
) )
if(NOT QT_MKSPEC MATCHES "winrt") if(NOT QT_MKSPEC MATCHES "winrt")
...@@ -112,7 +112,7 @@ if(NOT QT_MKSPEC MATCHES "winrt") ...@@ -112,7 +112,7 @@ if(NOT QT_MKSPEC MATCHES "winrt")
SerialPort SerialPort
REQUIRED REQUIRED
HINTS HINTS
${QT_LIBRARY_HINTS} ${QT_LIBRARY_HINTS}
) )
endif() endif()
......
src/CMakeLists.txt
View file @ a76dc8c2
...@@ -139,15 +139,15 @@ add_subdirectory(VideoStreaming) ...@@ -139,15 +139,15 @@ add_subdirectory(VideoStreaming)
add_subdirectory(ViewWidgets) add_subdirectory(ViewWidgets)
target_link_libraries(qgc target_link_libraries(qgc
PRIVATE PRIVATE
shp shp
PUBLIC PUBLIC
Qt5::QuickWidgets Qt5::QuickWidgets
Qt5::Widgets Qt5::Widgets
Airmap Airmap
AnalyzeView AnalyzeView
api api
Audio Audio
AutoPilotPlugins AutoPilotPlugins
...@@ -158,7 +158,7 @@ target_link_libraries(qgc ...@@ -158,7 +158,7 @@ target_link_libraries(qgc
FlightDisplay FlightDisplay
FlightMap FlightMap
FollowMe FollowMe
gps gps
Joystick Joystick
MissionManager MissionManager
PositionManager PositionManager
...@@ -179,11 +179,11 @@ if(BUILD_TESTING) ...@@ -179,11 +179,11 @@ if(BUILD_TESTING)
endif() endif()
target_include_directories(qgc target_include_directories(qgc
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/ui/ui_autogen/include # HACK: AUTOUIC paths not inheriting? ${CMAKE_CURRENT_BINARY_DIR}/ui/ui_autogen/include # HACK: AUTOUIC paths not inheriting?
${CMAKE_CURRENT_BINARY_DIR}/ui/ui_autogen/include_Debug ${CMAKE_CURRENT_BINARY_DIR}/ui/ui_autogen/include_Debug
${CMAKE_CURRENT_BINARY_DIR}/qgc_autogen/include # HACK: AUTOUIC paths not inheriting? ${CMAKE_CURRENT_BINARY_DIR}/qgc_autogen/include # HACK: AUTOUIC paths not inheriting?
${CMAKE_CURRENT_BINARY_DIR}/qgc_autogen/include_Debug ${CMAKE_CURRENT_BINARY_DIR}/qgc_autogen/include_Debug
) )
src/Vehicle/CMakeLists.txt
View file @ a76dc8c2
...@@ -16,8 +16,8 @@ add_library(Vehicle ...@@ -16,8 +16,8 @@ add_library(Vehicle
) )
target_link_libraries(Vehicle target_link_libraries(Vehicle
PRIVATE PRIVATE
ui ui
PUBLIC PUBLIC
qgc qgc
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment