Browse Source

cmake: MissionManager add TakeoffMissionItem

QGC4.4
Daniel Agar 5 years ago
parent
commit
07934419af
  1. 2
      cmake/Qt5QGCConfiguration.cmake
  2. 6
      libs/shapelib/CMakeLists.txt
  3. 2
      src/MissionManager/CMakeLists.txt

2
cmake/Qt5QGCConfiguration.cmake

@ -4,7 +4,7 @@ endif() @@ -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})

6
libs/shapelib/CMakeLists.txt

@ -39,6 +39,8 @@ add_compile_options( @@ -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) @@ -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) @@ -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")

2
src/MissionManager/CMakeLists.txt

@ -119,6 +119,8 @@ add_library(MissionManager @@ -119,6 +119,8 @@ add_library(MissionManager
SurveyComplexItem.h
SurveyPlanCreator.cc
SurveyPlanCreator.h
TakeoffMissionItem.cc
TakeoffMissionItem.h
TransectStyleComplexItem.cc
TransectStyleComplexItem.h
VisualMissionItem.cc

Loading…
Cancel
Save