Mercurial > trustbridge
changeset 112:9bfa2a60b9b8
Merged
author | Sascha Wilde <wilde@intevation.de> |
---|---|
date | Fri, 21 Mar 2014 16:02:02 +0100 |
parents | 36ac0697339e (current diff) 37198bd07182 (diff) |
children | 02ad0922c01f |
files | |
diffstat | 3 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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