[Gemrb-commits] gemrb: branch master updated. v0.7.0-65-g8ba3340

[Tom <rtp...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  8ba3340317882ec13ed3374ad3141169bc59dd9c (commit)
       via  787b7c3b6637e59b44b2f8cad70b89836bd439c9 (commit)

Summary of changes:
 CMakeLists.txt |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
      from  5dcc9dd265589913bdff43ec29f2349f5d32f6e7 (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=8ba3340317882ec13ed3374ad3141169bc59dd9c

commit 8ba3340317882ec13ed3374ad3141169bc59dd9c
Author: Tom Prince <tom...@ua...>
Date:   Sat Jan 14 15:42:28 2012 -0500

    clang is g++ compatible, so treat it the same way.
    
    CMAKE_CXX_COMPILER_ID is documented at http://www.cmake.org/cmake/help/cmake2.6docs.html

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03459e5..3f2bcad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,7 +129,7 @@ else()
 	set (GIT_VERSION 1)
 endif()
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
+IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
 	if ((NOT DISABLE_WERROR) AND GIT_VERSION)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 	endif ()
@@ -150,7 +150,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 	if (NOT APPLE AND NOT UNSAFE_PLUGIN)
 		set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
 	endif (NOT APPLE AND NOT UNSAFE_PLUGIN)
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ENDIF()
 
 # Check for all the required and optional dependencies
 INCLUDE(FindPythonLibs)

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=787b7c3b6637e59b44b2f8cad70b89836bd439c9

commit 787b7c3b6637e59b44b2f8cad70b89836bd439c9
Author: Tom Prince <tom...@ua...>
Date:   Sat Jan 14 15:37:57 2012 -0500

    Require CMake 2.6.0+.
    
    We don't actually test anything before 2.8.*, so bump the version we require somewhat.
    
    CentOS 6.2 has cmake 2.6.4 ....

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 330b90d..03459e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,8 @@
-cmake_minimum_required(VERSION 2.4.4)
+cmake_minimum_required(VERSION 2.6.0)
 if(COMMAND cmake_policy)
 	cmake_policy(SET CMP0003 NEW)
 	cmake_policy(SET CMP0005 NEW)
 endif(COMMAND cmake_policy)
-# allow empty else and endif constructs (available by default since 2.6.0)
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
 # prevent in-source builds
 IF(NOT INSOURCEBUILD AND (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}))

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


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