Author: mordante
Date: Wed May 20 19:13:49 2009
New Revision: 35772
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35772&view=rev
Log:
Let cmake also use the environment variables.
It now uses CXXFLAGS and CFLAGS like autotools.
Modified:
trunk/CMakeLists.txt
trunk/changelog
Modified: trunk/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/CMakeLists.txt?rev=35772&r1=35771&r2=35772&view=diff
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Wed May 20 19:13:49 2009
@@ -106,14 +106,14 @@
# Strict compilation for C files is disabled until somebody
wants to clean them.
- set(CMAKE_C_FLAGS "-O2 -W -Wall -ansi"
+ set(CMAKE_C_FLAGS "-O2 -W -Wall -ansi $ENV{CFLAGS}"
CACHE STRING "Flags used by the C compiler
during normal builds." FORCE)
- set(CMAKE_C_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -ansi"
+ set(CMAKE_C_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -ansi
$ENV{CFLAGS}"
CACHE STRING "Flags used by the C compiler
during debug builds." FORCE)
- set(CMAKE_CXX_FLAGS "-O2 -W -Wall -ansi ${STRICT_FLAGS}"
+ set(CMAKE_CXX_FLAGS "-O2 -W -Wall -ansi ${STRICT_FLAGS}
$ENV{CXXFLAGS}"
CACHE STRING "Flags used by the CXX compiler
during normal builds." FORCE)
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -ansi
${STRICT_FLAGS}"
+ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -ansi
${STRICT_FLAGS} $ENV{CXXFLAGS}"
CACHE STRING "Flags used by the CXX compiler
during debug builds." FORCE)
endif(NOT CONFIGURED)
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=35772&r1=35771&r2=35772&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Wed May 20 19:13:49 2009
@@ -3,6 +3,7 @@
* Updated translations:
* Miscellaneous and bugfixes:
* Add strict compilation to cmake
+ * Let cmake also use the CXXFLAGS and CFLAGS environment variables
Version 1.7.0:
* AI:
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
