Browse Source

Spaces vs Tabs

QGC4.4
Tomaz Canabrava 6 years ago committed by Daniel Agar
parent
commit
a76dc8c295
  1. 4
      CMakeLists.txt
  2. 24
      src/CMakeLists.txt
  3. 4
      src/Vehicle/CMakeLists.txt

4
CMakeLists.txt

@ -103,7 +103,7 @@ find_package(Qt5 ${QT_VERSION} @@ -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") @@ -112,7 +112,7 @@ if(NOT QT_MKSPEC MATCHES "winrt")
SerialPort
REQUIRED
HINTS
${QT_LIBRARY_HINTS}
${QT_LIBRARY_HINTS}
)
endif()

24
src/CMakeLists.txt

@ -139,15 +139,15 @@ add_subdirectory(VideoStreaming) @@ -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 @@ -158,7 +158,7 @@ target_link_libraries(qgc
FlightDisplay
FlightMap
FollowMe
gps
gps
Joystick
MissionManager
PositionManager
@ -179,11 +179,11 @@ if(BUILD_TESTING) @@ -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
)

4
src/Vehicle/CMakeLists.txt

@ -16,8 +16,8 @@ add_library(Vehicle @@ -16,8 +16,8 @@ add_library(Vehicle
)
target_link_libraries(Vehicle
PRIVATE
ui
PRIVATE
ui
PUBLIC
qgc
)

Loading…
Cancel
Save