Commit 07934419 authored by Daniel Agar's avatar Daniel Agar

cmake: MissionManager add TakeoffMissionItem

parent 356355c9
...@@ -4,7 +4,7 @@ endif() ...@@ -4,7 +4,7 @@ endif()
if(NOT QT_VERSION) if(NOT QT_VERSION)
# try Qt 5.12.0 if none specified, last LTS. # try Qt 5.12.0 if none specified, last LTS.
set(QT_VERSION "5.12.0") set(QT_VERSION "5.12.5")
endif() endif()
if(DEFINED ENV{QT_MKSPEC}) if(DEFINED ENV{QT_MKSPEC})
......
...@@ -39,6 +39,8 @@ add_compile_options( ...@@ -39,6 +39,8 @@ add_compile_options(
-Wno-return-type -Wno-return-type
) )
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
# Use rpath? # Use rpath?
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
# No rpath on Darwin. Setting it will only cause trouble. # 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) endif(BUILD_TEST)
foreach(executable ${executables}) foreach(executable ${executables})
add_executable(${executable} ${executable}.c) add_executable(${executable} EXCLUDE_FROM_ALL ${executable}.c)
target_link_libraries(${executable} shp) target_link_libraries(${executable} shp)
if(USE_RPATH) if(USE_RPATH)
set_target_properties(${executable} 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. # Other executables to be built to facilitate tests.
foreach(executable shptest shputils) foreach(executable shptest shputils)
add_executable(${executable} ${executable}.c) add_executable(${executable} EXCLUDE_FROM_ALL ${executable}.c)
target_link_libraries(${executable} shp) target_link_libraries(${executable} shp)
get_target_property(${executable}_LOC ${executable} LOCATION) get_target_property(${executable}_LOC ${executable} LOCATION)
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/script.sed "s?\\./${executable}?${${executable}_LOC}?\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/script.sed "s?\\./${executable}?${${executable}_LOC}?\n")
......
...@@ -119,6 +119,8 @@ add_library(MissionManager ...@@ -119,6 +119,8 @@ add_library(MissionManager
SurveyComplexItem.h SurveyComplexItem.h
SurveyPlanCreator.cc SurveyPlanCreator.cc
SurveyPlanCreator.h SurveyPlanCreator.h
TakeoffMissionItem.cc
TakeoffMissionItem.h
TransectStyleComplexItem.cc TransectStyleComplexItem.cc
TransectStyleComplexItem.h TransectStyleComplexItem.h
VisualMissionItem.cc VisualMissionItem.cc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment