# HG changeset patch
# User Sascha Wilde <wilde@intevation.de>
# Date 1395414122 -3600
# Node ID 9bfa2a60b9b86bcedf8d029b06a0348fdfd3d7fa
# Parent  36ac0697339e2854256a5b5b1e1a9e8a4e456c4d# Parent  37198bd07182017d98b06aa5e1757dfa47c5433f
Merged

diff -r 36ac0697339e -r 9bfa2a60b9b8 CMakeLists.txt
--- a/CMakeLists.txt	Fri Mar 21 15:59:46 2014 +0100
+++ b/CMakeLists.txt	Fri Mar 21 16:02:02 2014 +0100
@@ -7,7 +7,10 @@
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 
 #Old qtmain linking behavior to be compatible with cmake versions < 2.8.11
-cmake_policy(SET CMP0020 OLD)
+
+if(POLICY CMP0020)
+  cmake_policy(SET CMP0020 OLD)
+endif()
 
 include(CTest)
 include(GenerateCppcheck)
diff -r 36ac0697339e -r 9bfa2a60b9b8 cinst/CMakeLists.txt
--- a/cinst/CMakeLists.txt	Fri Mar 21 15:59:46 2014 +0100
+++ b/cinst/CMakeLists.txt	Fri Mar 21 16:02:02 2014 +0100
@@ -2,11 +2,6 @@
 
 set(CMAKE_AUTOMOC OFF)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/")
-
-find_package(PolarSSL)
-
-include_directories(${POLARSSL_INCLUDE_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../common)
 
 set(CINST_SOURCES
diff -r 36ac0697339e -r 9bfa2a60b9b8 common/CMakeLists.txt
--- a/common/CMakeLists.txt	Fri Mar 21 15:59:46 2014 +0100
+++ b/common/CMakeLists.txt	Fri Mar 21 16:02:02 2014 +0100
@@ -1,5 +1,3 @@
-include_directories(${POLARSSL_INCLUDE_DIR})
-
 set (m13_common_src
    listutil.c
    strhelp.c