List:Commits« Previous MessageNext Message »
From:Stewart Smith Date:October 30 2008 2:16pm
Subject:bzr commit into mysql-5.1 branch (stewart:3023)
View as plain text  
#At file:///home/stewart/mysql/ndbwin32/

 3023 Stewart Smith	2008-10-31
      fix whoopsy in CmakeLists.txt merge
modified:
  CMakeLists.txt

=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2008-10-30 13:27:52 +0000
+++ b/CMakeLists.txt	2008-10-30 14:16:12 +0000
@@ -130,7 +130,6 @@ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAK
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805")
 
-=======
 # Disable warnings in Visual Studio 8 and above
 IF(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")
     SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")

Thread
bzr commit into mysql-5.1 branch (stewart:3023) Stewart Smith30 Oct