From a76dc8c295919c772d759c3c75868576ec491d8d Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Sun, 30 Jun 2019 18:14:47 +0200 Subject: [PATCH] Spaces vs Tabs --- CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 24 ++++++++++++------------ src/Vehicle/CMakeLists.txt | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e35e3318..21974be99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,7 @@ find_package(Qt5 ${QT_VERSION} Xml REQUIRED HINTS - ${QT_LIBRARY_HINTS} + ${QT_LIBRARY_HINTS} ) if(NOT QT_MKSPEC MATCHES "winrt") @@ -112,7 +112,7 @@ if(NOT QT_MKSPEC MATCHES "winrt") SerialPort REQUIRED HINTS - ${QT_LIBRARY_HINTS} + ${QT_LIBRARY_HINTS} ) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e6c15c95e..92e919857 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -139,15 +139,15 @@ add_subdirectory(VideoStreaming) add_subdirectory(ViewWidgets) target_link_libraries(qgc - PRIVATE + PRIVATE shp PUBLIC - Qt5::QuickWidgets - Qt5::Widgets + Qt5::QuickWidgets + Qt5::Widgets Airmap - AnalyzeView + AnalyzeView api Audio AutoPilotPlugins @@ -158,7 +158,7 @@ target_link_libraries(qgc FlightDisplay FlightMap FollowMe - gps + gps Joystick MissionManager PositionManager @@ -179,11 +179,11 @@ if(BUILD_TESTING) endif() target_include_directories(qgc - PUBLIC - ${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_Debug - ${CMAKE_CURRENT_BINARY_DIR}/qgc_autogen/include # HACK: AUTOUIC paths not inheriting? - ${CMAKE_CURRENT_BINARY_DIR}/qgc_autogen/include_Debug - ) + PUBLIC + ${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_Debug + ${CMAKE_CURRENT_BINARY_DIR}/qgc_autogen/include # HACK: AUTOUIC paths not inheriting? + ${CMAKE_CURRENT_BINARY_DIR}/qgc_autogen/include_Debug +) diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt index 97ff30627..0b058fb5b 100644 --- a/src/Vehicle/CMakeLists.txt +++ b/src/Vehicle/CMakeLists.txt @@ -16,8 +16,8 @@ add_library(Vehicle ) target_link_libraries(Vehicle - PRIVATE - ui + PRIVATE + ui PUBLIC qgc ) -- 2.22.0