Author: mordante
Date: Tue May 19 20:17:12 2009
New Revision: 35756
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35756&view=rev
Log:
Add strict compilation to cmake.
Modified:
trunk/CMakeLists.txt
trunk/changelog
Modified: trunk/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/CMakeLists.txt?rev=35756&r1=35755&r2=35756&view=diff
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Tue May 19 20:17:12 2009
@@ -79,6 +79,7 @@
set(ICONDIR "${DATAROOTDIR}/pixmaps" CACHE STRING "Sets the icon directory
for desktop entry to a non-default location.")
set(DESKTOPDIR "${DATAROOTDIR}/applications/" CACHE STRING "Sets the desktop
file directory for desktop entry to a non-default location.")
endif(UNIX AND NOT APPLE AND NOT CYGWIN)
+option(ENABLE_STRICT_COMPILATION "Sets the strict compilation mode" ON)
#misc options
if(NOT MSVC)
@@ -94,15 +95,29 @@
#
if(CMAKE_COMPILER_IS_GNUCXX)
- # Set our own default debug flags at first run
+ # Set our own default flags at first run.
if(NOT CONFIGURED)
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -ansi"
CACHE STRING "Flags used by the compiler during debug builds." FORCE)
+
+ if(ENABLE_STRICT_COMPILATION)
+ set(STRICT_FLAGS "-Werror -Wno-unused-parameter")
+ else(ENABLE_STRICT_COMPILATION)
+ set(STRICT_FLAGS "")
+ endif(ENABLE_STRICT_COMPILATION)
+
+
+ # Strict compilation for C files is disabled until somebody
wants to clean them.
+ set(CMAKE_C_FLAGS "-O2 -W -Wall -ansi"
+ CACHE STRING "Flags used by the C compiler
during normal builds." FORCE)
+ set(CMAKE_C_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -ansi"
+ CACHE STRING "Flags used by the C compiler
during debug builds." FORCE)
+
+ set(CMAKE_CXX_FLAGS "-O2 -W -Wall -ansi ${STRICT_FLAGS}"
+ 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}"
+ CACHE STRING "Flags used by the CXX compiler
during debug builds." FORCE)
+
endif(NOT CONFIGURED)
- #Add build-type: DEBUGSTRICT
- set(CMAKE_CXX_FLAGS_DEBUGSTRICT "-O0 -DDEBUG -ggdb3 -W -Wall -ansi
-Werror -Wno-unused-parameter" CACHE STRING "Flags used by the compiler during
strict debug builds.")
- set(CMAKE_EXE_LINKER_FLAGS_DEBUGSTRICT
"${CMAKE_EXE_LINKER_FLAGS_DEBUG}" CACHE STRING "Flags used for linking binaries
during strict debug builds.")
- mark_as_advanced(CMAKE_CXX_FLAGS_DEBUGSTRICT
CMAKE_EXE_LINKER_FLAGS_DEBUGSTRICT)
endif(CMAKE_COMPILER_IS_GNUCXX)
# compose datadir path of datarootdir and datadirname
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=35756&r1=35755&r2=35756&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Tue May 19 20:17:12 2009
@@ -1,6 +1,8 @@
Version 1.7.0+svn:
* Language and i18n:
* Updated translations:
+ * Miscellaneous and bugfixes:
+ * Add strict compilation to cmake
Version 1.7.0:
* AI:
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
