diff options
| author | gkodinov/kgeorge@magare.gmz <> | 2008-03-21 17:48:28 +0200 |
|---|---|---|
| committer | gkodinov/kgeorge@magare.gmz <> | 2008-03-21 17:48:28 +0200 |
| commit | f6871c0d661d1d6be814cc539bd33d5bf1a243d2 (patch) | |
| tree | 4f0c113cf15f0425c7fedd53da1c81aa881a00ea /CMakeLists.txt | |
| parent | 9d03658bf2b846410f86acd6cc97a446a1ee9113 (diff) | |
| parent | dff2a4c3a3c219417340870fc25796b498e67764 (diff) | |
| download | mariadb-git-f6871c0d661d1d6be814cc539bd33d5bf1a243d2.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B26461-5.1-opt
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 341f8d08df2..4bdafc7f4a0 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,6 +104,10 @@ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DDBUG_OFF") SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF") +#TODO: update the code and remove the disabled warnings +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805") + IF(CMAKE_GENERATOR MATCHES "Visual Studio 8") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996") SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996") |