[sword-svn] r3278 - branches/sword-1-7-x

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2014-12-02 23:02:12 -0700 (Tue, 02 Dec 2014)
New Revision: 3278

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/CMakeLists.txt
Log:
Merging r3234



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:2989-2991,2997,3001-3004,3006,3010-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140,3144,3151,3153-3155,3190-3192,3198-3199,3202-3203,3225,3230,3232-3233
   + /trunk:2989-2991,2997,3001-3004,3006,3010-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140,3144,3151,3153-3155,3190-3192,3198-3199,3202-3203,3225,3230,3232-3234

Modified: branches/sword-1-7-x/CMakeLists.txt
===================================================================
--- branches/sword-1-7-x/CMakeLists.txt	2014-12-03 06:01:43 UTC (rev 3277)
+++ branches/sword-1-7-x/CMakeLists.txt	2014-12-03 06:02:12 UTC (rev 3278)
@@ -166,10 +166,10 @@
 ENDIF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes")
 
 IF(MSVC)
-	SET(CMAKE_C_FLAGS_DEBUG            "/D -Wall /O0 /DDEBUG ${CMAKE_C_FLAGS}")
+	SET(CMAKE_C_FLAGS_DEBUG            "/D /O0 /DDEBUG ${CMAKE_C_FLAGS}")
 	SET(CMAKE_C_FLAGS_RELEASE          "/O3 /DNDEBUG ${CMAKE_C_FLAGS}")
 	SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "/O3 /D /DDEBUG ${CMAKE_C_FLAGS}")
-	SET(CMAKE_CXX_FLAGS_DEBUG          "/D -Wall /O0 /DDEBUG ${CMAKE_CXX_FLAGS}")
+	SET(CMAKE_CXX_FLAGS_DEBUG          "/D /O0 /DDEBUG ${CMAKE_CXX_FLAGS}")
 	SET(CMAKE_CXX_FLAGS_RELEASE        "/O3 ${CMAKE_CXX_FLAGS}")
 	SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O3 /D /DDEBUG ${CMAKE_CXX_FLAGS}")
 ELSE(MSVC)