Merge branch 'master' into cmake-overhaul

This commit is contained in:
Fabio Bas 2014-06-10 23:11:31 +02:00
commit 39e2bf06f5
41 changed files with 2619 additions and 831 deletions

View file

@ -1,4 +1,10 @@
cmake_minimum_required(VERSION 2.6)
IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
# GNU systems need to define the Mersenne exponent for the RNG to compile w/o warning
ADD_DEFINITIONS("-DSFMT_MEXP=19937")
ENDIF()
add_subdirectory(common)
if(WITH_SERVER)
add_subdirectory(servatrice)