Skip to content

Commit

Permalink
Spaces vs Tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
tcanabrava authored and dagar committed Jun 30, 2019
1 parent fe327d4 commit a76dc8c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ find_package(Qt5 ${QT_VERSION}
Xml
REQUIRED
HINTS
${QT_LIBRARY_HINTS}
${QT_LIBRARY_HINTS}
)

if(NOT QT_MKSPEC MATCHES "winrt")
Expand All @@ -112,7 +112,7 @@ if(NOT QT_MKSPEC MATCHES "winrt")
SerialPort
REQUIRED
HINTS
${QT_LIBRARY_HINTS}
${QT_LIBRARY_HINTS}
)
endif()

Expand Down
24 changes: 12 additions & 12 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -158,7 +158,7 @@ target_link_libraries(qgc
FlightDisplay
FlightMap
FollowMe
gps
gps
Joystick
MissionManager
PositionManager
Expand All @@ -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 changes: 2 additions & 2 deletions src/Vehicle/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ add_library(Vehicle
)

target_link_libraries(Vehicle
PRIVATE
ui
PRIVATE
ui
PUBLIC
qgc
)
Expand Down

0 comments on commit a76dc8c

Please sign in to comment.