[Gemrb-commits] gemrb: branch master updated. v0.7.1-163-g650de7b

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  650de7b5043583f5f3f7b7304bac5cde28965229 (commit)

Summary of changes:
 CMakeLists.txt |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
      from  a28b943c4a12ff42c3334d660895d14f2d823ebf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=650de7b5043583f5f3f7b7304bac5cde28965229

commit 650de7b5043583f5f3f7b7304bac5cde28965229
Author: Jaka Kranjc <lyn...@us...>
Date:   Tue Sep 11 20:53:06 2012 +0200

    cmake: use find_package's version check if available
    
    fixes debian sid python2 detection

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3ce2db..34dd0f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,7 +160,11 @@ ENDIF()
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
 
 # Check for all the required and optional dependencies
-INCLUDE(FindPythonLibs)
+IF((CMAKE_MAJOR_VERSION GREATER 1) AND (CMAKE_MINOR_VERSION GREATER 7))
+	FIND_PACKAGE(PythonLibs 2.3 REQUIRED)
+ELSE((CMAKE_MAJOR_VERSION GREATER 1) AND (CMAKE_MINOR_VERSION GREATER 7))
+	INCLUDE(FindPythonLibs)
+ENDIF((CMAKE_MAJOR_VERSION GREATER 1) AND (CMAKE_MINOR_VERSION GREATER 7))
 IF(PYTHONLIBS_FOUND)
 	MESSAGE(STATUS "Looking for Python libraries and headers: found")
 ELSE()

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator