diff --git a/cmake/Qt5QGCConfiguration.cmake b/cmake/Qt5QGCConfiguration.cmake
index 6f8cd59ae19f248568e8a44f15129c60348fb375..42e552cee70bd420b6eb65dbfbb0acbbb629a24f 100644
--- a/cmake/Qt5QGCConfiguration.cmake
+++ b/cmake/Qt5QGCConfiguration.cmake
@@ -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})
diff --git a/libs/shapelib/CMakeLists.txt b/libs/shapelib/CMakeLists.txt
index f581a8e878fcbd903581cc61419a0f34faa25e59..f231201ea99d4913fd58a66f7a905938181a5684 100644
--- a/libs/shapelib/CMakeLists.txt
+++ b/libs/shapelib/CMakeLists.txt
@@ -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")
diff --git a/src/MissionManager/CMakeLists.txt b/src/MissionManager/CMakeLists.txt
index 63af502aa5852a1c81e6d61bdc13d5ff74785959..06e50161ee968189538f7b9518318fa723ec0c11 100644
--- a/src/MissionManager/CMakeLists.txt
+++ b/src/MissionManager/CMakeLists.txt
@@ -119,6 +119,8 @@ add_library(MissionManager
 	SurveyComplexItem.h
 	SurveyPlanCreator.cc
 	SurveyPlanCreator.h
+	TakeoffMissionItem.cc
+	TakeoffMissionItem.h
 	TransectStyleComplexItem.cc
 	TransectStyleComplexItem.h
 	VisualMissionItem.cc