Author: mordante
Date: Sun Apr 12 17:45:12 2009
New Revision: 34788
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34788&view=rev
Log:
Only set the g++ compiler flags for g++.
There were some problems on MSVC with the g++ compiler flags. This patch
should fix it, but that's untested. (It's tested that it doesn't break
g++.)
Modified:
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/CMakeLists.txt?rev=34788&r1=34787&r2=34788&view=diff
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Sun Apr 12 17:45:12 2009
@@ -88,15 +88,17 @@
# Handle options (set paths/definitions/etc...)
#
-# Set our own default debug 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)
-endif(NOT CONFIGURED)
-
-#Add build-type: DEBUGSTRICT
-set(CMAKE_CXX_FLAGS_DEBUGSTRICT "-O0 -DDEBUG -ggdb3 -W -Wall -ansi -Werror
-Wno-unused -Wno-sign-compare" 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)
+if(CMAKE_COMPILER_IS_GNUCXX)
+ # Set our own default debug 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)
+ endif(NOT CONFIGURED)
+
+ #Add build-type: DEBUGSTRICT
+ set(CMAKE_CXX_FLAGS_DEBUGSTRICT "-O0 -DDEBUG -ggdb3 -W -Wall -ansi
-Werror -Wno-unused -Wno-sign-compare" 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
set(DATADIR ${DATAROOTDIR}/${DATADIRNAME})
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
