Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
a76dc8c2
Commit
a76dc8c2
authored
Jun 30, 2019
by
Tomaz Canabrava
Committed by
Daniel Agar
Jun 30, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Spaces vs Tabs
parent
fe327d49
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
16 deletions
+16
-16
CMakeLists.txt
CMakeLists.txt
+2
-2
CMakeLists.txt
src/CMakeLists.txt
+12
-12
CMakeLists.txt
src/Vehicle/CMakeLists.txt
+2
-2
No files found.
CMakeLists.txt
View file @
a76dc8c2
...
...
@@ -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
()
...
...
src/CMakeLists.txt
View file @
a76dc8c2
...
...
@@ -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
)
src/Vehicle/CMakeLists.txt
View file @
a76dc8c2
...
...
@@ -16,8 +16,8 @@ add_library(Vehicle
)
target_link_libraries
(
Vehicle
PRIVATE
ui
PRIVATE
ui
PUBLIC
qgc
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment