--- CMakeLists.txt.orig 2013-05-02 04:53:08 UTC +++ CMakeLists.txt @@ -1,6 +1,6 @@ PROJECT(Joytran) ## -*- coding: utf-8 -*- PROJECT(Joytran) -CMAKE_MINIMUM_REQUIRED(VERSION 2.8) +CMAKE_MINIMUM_REQUIRED(VERSION 3.5) OPTION(INSTALL_DOCUMENTATION "install documentation" ON) # On is the default OPTION(WITH_SDL_20 "Use SDL 2.0" ON) @@ -119,9 +119,9 @@ ENDIF() SET(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -DWITH_SDL2") ENDIF() ## These work in both clang and gcc -SET(WARNING_FLAGS "-W -Wall -Werror -pedantic") +SET(WARNING_FLAGS "-W -Wall -pedantic") SET(CMAKE_C_FLAGS - "${WARNING_FLAGS} -isystem${CMAKE_INCLUDE_PATH} ${CMAKE_CPP_FLAGS}") + "${WARNING_FLAGS} -isystem${CMAKE_INCLUDE_PATH} ${CMAKE_CPP_FLAGS} -fcommon") SET(CMAKE_LD_FLAGS "-L${CMAKE_LIB_PATH} -lX11 -lXtst -l${SDL_LIB}") SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_LD_FLAGS}") SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CMAKE_LD_FLAGS}")