Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
07934419
Commit
07934419
authored
Nov 14, 2019
by
Daniel Agar
Browse files
cmake: MissionManager add TakeoffMissionItem
parent
356355c9
Changes
3
Hide whitespace changes
Inline
Side-by-side
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
Supports
Markdown
0%
Try again
or
attach a new 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