diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e35e3318f8fb7adce284ba7676cfe4867012a73..21974be991e4eed51a0b10e6ea46b4397e430897 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 e6c15c95e93f55821e3fd89a84b9665684e9d724..92e919857b45379a1944781dbe05ae545a1d9879 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 97ff306278e102675950bce2c8f6b8c29da975c2..0b058fb5b606e48758de69b9aae7e85823970870 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 )