From b7e8d1929032c77abde1befb5e7649ab72b120c8 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sat, 10 Oct 2015 15:15:43 +0200 Subject: [PATCH] Fix for travis build --- CMakeLists.txt | 4 +++- CMakeModules/FindOrBuild.cmake | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 330dddf02..704098027 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 2.8.7) -cmake_policy(SET CMP0054 NEW) +if(CMAKE_MAJOR_VERSION STRGREATER 3) + cmake_policy(SET CMP0054 NEW) +endif() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeModules) diff --git a/CMakeModules/FindOrBuild.cmake b/CMakeModules/FindOrBuild.cmake index af7e5f5db..8621fa5d5 100644 --- a/CMakeModules/FindOrBuild.cmake +++ b/CMakeModules/FindOrBuild.cmake @@ -110,7 +110,9 @@ macro(FindOrBuildGIF) if(BUILD_GIF) message(WARNING "GIF sources are currently not included within the wagic tree") else() - find_package(GIF) + if(PSP) + find_package(GIF) + endif() endif() endmacro()