[Performous-commit] Lasse Karkkainen : Update CMakeLists.txts to indicate that CMake 2. 6 is required (they didn't work with 2.4 anyway) and remove old compatibility options.

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: 0.3
Commit: 4f8e35ff235bc513b8cfcde0208f42c556d34960

Author: Lasse Karkkainen <tro...@tr...>
Date:   Mon Jul 13 23:50:28 2009 +0300

Update CMakeLists.txts to indicate that CMake 2.6 is required (they didn't work with 2.4 anyway) and remove old compatibility options.

---

 CMakeLists.txt       |    8 ++------
 game/CMakeLists.txt  |    6 +-----
 tools/CMakeLists.txt |    6 +-----
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0690fc4..d54a8c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(Performous CXX)
-cmake_minimum_required(VERSION 2.4)
+cmake_minimum_required(VERSION 2.6)
 set(PROJECT_VERSION "0.3.2")
 
 # Avoid source tree pollution
@@ -7,11 +7,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
 	message(FATAL_ERROR "In-source builds are not permitted. Make a separate folder for building:\nmkdir build; cd build; cmake ..\nBefore that, remove the files already created:\nrm -rf CMakeCache.txt CMakeFiles")
 endif(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
 
-if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 5)
-  include("${CMAKE_SOURCE_DIR}/cmake/performous-packaging.cmake")
-else(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 5)
-  message("Automatic packaging support disabled (CMake 2.6 or later required)")
-endif(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 5)
+include("${CMAKE_SOURCE_DIR}/cmake/performous-packaging.cmake")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index c9584e9..848567e 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -1,8 +1,4 @@
-cmake_minimum_required(VERSION 2.4)
-
-if(COMMAND cmake_policy)
-	cmake_policy(SET CMP0003 NEW)
-endif(COMMAND cmake_policy)
+cmake_minimum_required(VERSION 2.6)
 
 FILE(GLOB SOURCE_FILES "*.cc")
 FILE(GLOB HEADER_FILES "*.hh")
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 5244b0d..f9d7c35 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,8 +1,4 @@
-cmake_minimum_required(VERSION 2.4)
-
-if(COMMAND cmake_policy)
-	cmake_policy(SET CMP0003 NEW)
-endif(COMMAND cmake_policy)
+cmake_minimum_required(VERSION 2.6)
 
 # Libraries