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
07934419
Commit
07934419
authored
Nov 14, 2019
by
Daniel Agar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: MissionManager add TakeoffMissionItem
parent
356355c9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
Qt5QGCConfiguration.cmake
cmake/Qt5QGCConfiguration.cmake
+1
-1
CMakeLists.txt
libs/shapelib/CMakeLists.txt
+4
-2
CMakeLists.txt
src/MissionManager/CMakeLists.txt
+2
-0
No files found.
cmake/Qt5QGCConfiguration.cmake
View file @
07934419
...
...
@@ -4,7 +4,7 @@ endif()
if
(
NOT QT_VERSION
)
# try Qt 5.12.0 if none specified, last LTS.
set
(
QT_VERSION
"5.12.
0
"
)
set
(
QT_VERSION
"5.12.
5
"
)
endif
()
if
(
DEFINED ENV{QT_MKSPEC}
)
...
...
libs/shapelib/CMakeLists.txt
View file @
07934419
...
...
@@ -39,6 +39,8 @@ add_compile_options(
-Wno-return-type
)
set
(
CMAKE_POSITION_INDEPENDENT_CODE ON
)
# Use rpath?
if
(
CMAKE_SYSTEM_NAME STREQUAL
"Darwin"
)
# No rpath on Darwin. Setting it will only cause trouble.
...
...
@@ -175,7 +177,7 @@ if(BUILD_TEST)
endif
(
BUILD_TEST
)
foreach
(
executable
${
executables
}
)
add_executable
(
${
executable
}
${
executable
}
.c
)
add_executable
(
${
executable
}
EXCLUDE_FROM_ALL
${
executable
}
.c
)
target_link_libraries
(
${
executable
}
shp
)
if
(
USE_RPATH
)
set_target_properties
(
${
executable
}
...
...
@@ -200,7 +202,7 @@ if(BUILD_TEST)
# Other executables to be built to facilitate tests.
foreach
(
executable shptest shputils
)
add_executable
(
${
executable
}
${
executable
}
.c
)
add_executable
(
${
executable
}
EXCLUDE_FROM_ALL
${
executable
}
.c
)
target_link_libraries
(
${
executable
}
shp
)
get_target_property
(
${
executable
}
_LOC
${
executable
}
LOCATION
)
file
(
APPEND
${
CMAKE_CURRENT_BINARY_DIR
}
/script.sed
"s?
\\
./
${
executable
}
?
${${
executable
}
_LOC
}
?
\n
"
)
...
...
src/MissionManager/CMakeLists.txt
View file @
07934419
...
...
@@ -119,6 +119,8 @@ add_library(MissionManager
SurveyComplexItem.h
SurveyPlanCreator.cc
SurveyPlanCreator.h
TakeoffMissionItem.cc
TakeoffMissionItem.h
TransectStyleComplexItem.cc
TransectStyleComplexItem.h
VisualMissionItem.cc
...
...
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