# HG changeset patch # User koda # Date 1388445552 -3600 # Node ID d6d3be73d427beb8e41936bd8910ae258f036eb7 # Parent 749369ad65a924f4785a9fb11dc0d971344cd867 move CMAKE_Pascal_FLAGS_* flags after enabling the Pascal language or they get overwritten diff -r 749369ad65a9 -r d6d3be73d427 CMakeLists.txt --- a/CMakeLists.txt Mon Dec 30 14:56:47 2013 -0500 +++ b/CMakeLists.txt Tue Dec 31 00:19:12 2013 +0100 @@ -79,9 +79,6 @@ add_flag_append(CMAKE_CXX_FLAGS "-Wall -pipe") add_flag_append(CMAKE_CXX_FLAGS_RELEASE "-Os") add_flag_append(CMAKE_CXX_FLAGS_DEBUG "-Wextra -O0") -add_flag_append(CMAKE_Pascal_FLAGS "-Cs2000000") -add_flag_append(CMAKE_Pascal_FLAGS_DEBUG "-O- -gv") -add_flag_append(CMAKE_Pascal_FLAGS_RELEASE "-Os -Xs") #CMake adds a lot of additional configuration flags, so let's clear them up if(${MINIMAL_FLAGS}) diff -r 749369ad65a9 -r d6d3be73d427 hedgewars/CMakeLists.txt --- a/hedgewars/CMakeLists.txt Mon Dec 30 14:56:47 2013 -0500 +++ b/hedgewars/CMakeLists.txt Tue Dec 31 00:19:12 2013 +0100 @@ -8,6 +8,10 @@ enable_language(Pascal) +add_flag_append(CMAKE_Pascal_FLAGS "-Cs2000000") +add_flag_append(CMAKE_Pascal_FLAGS_DEBUG "-O- -gv") +add_flag_append(CMAKE_Pascal_FLAGS_RELEASE "-Os -Xs") + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.inc.in ${CMAKE_CURRENT_BINARY_DIR}/config.inc) include_directories(${CMAKE_CURRENT_BINARY_DIR})