diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ba0722bc3ae15be907756a9346c598e2dece7a9..2796f029ab64ac749c2b813dd469966bd1aa6a18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,8 +137,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 		-Wextra
 		-Werror
 
-		-frtti
-
 		-Wno-address-of-packed-member # ignore for mavlink
 	)
 
@@ -152,8 +150,6 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 		-Wall
 		-Wextra
 		-Werror
-
-		-frtti
 	)
 	
 elseif (WIN32)
@@ -175,6 +171,8 @@ include_directories(
 	libs/mavlink/include/mavlink/v2.0
 	libs/mavlink/include/mavlink/v2.0/ardupilotmega
 	libs/mavlink/include/mavlink/v2.0/common
+
+	libs/shapelib
 )
 
 add_subdirectory(libs)
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index 0321d418c22844b7ca6d16ce7615833250cc9e65..ddd3b9406a7a4ae38ebb9e86dcf51948e13b14b0 100644
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -1,4 +1,3 @@
-
-add_subdirectory(qwt)
 add_subdirectory(qtandroidserialport)
-
+add_subdirectory(qwt)
+add_subdirectory(shapelib)
diff --git a/libs/shapelib/CMakeLists.txt b/libs/shapelib/CMakeLists.txt
index c3ef9350f53813c028f403d87aa20f321504f2b2..f581a8e878fcbd903581cc61419a0f34faa25e59 100644
--- a/libs/shapelib/CMakeLists.txt
+++ b/libs/shapelib/CMakeLists.txt
@@ -29,7 +29,15 @@ message(STATUS "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}")
 cmake_minimum_required(VERSION 2.8.5 FATAL_ERROR)
 
 # libraries are all shared by default.
-option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
+
+cmake_policy(SET CMP0026 OLD) # Disallow use of the LOCATION property for build targets
+
+add_compile_options(
+	-Wno-missing-braces
+	-Wno-sign-compare
+	-Wno-return-type
+)
 
 # Use rpath?
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
@@ -148,7 +156,7 @@ set(executables
 find_program(BASH_EXECUTABLE bash)
 find_program(SED_EXECUTABLE sed)
 if(BASH_EXECUTABLE AND SED_EXECUTABLE)
-  set(BUILD_TEST ON)
+  #set(BUILD_TEST ON)
 else(BASH_EXECUTABLE AND SED_EXECUTABLE)
   message(STATUS "WARNING: sed or bash not available so disabling testing")
 endif(BASH_EXECUTABLE AND SED_EXECUTABLE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 44d1bc33d5f5a088aba079c1751b59b292605fc4..f27db15ca06a8d4ae9438a5b66e91a6a6a4c075d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -88,6 +88,8 @@ add_library(qgc
 	QGCTemporaryFile.cc
 	QGCToolbox.cc
 	RunGuard.cc
+	ShapeFileHelper.cc
+	SHPFileHelper.cc
 	TerrainTile.cc
 	UTM.cpp
 
@@ -128,6 +130,7 @@ add_subdirectory(ViewWidgets)
 
 target_link_libraries(qgc
         PRIVATE
+		shp
 
 	PUBLIC
                 Qt5::QuickWidgets