Fix for travis build

2015-10-10 15:15:43 +02:00
parent d0db71602a
commit b7e8d19290
2 changed files with 6 additions and 2 deletions
--- 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)

--- 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()