diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-27 23:35:56 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-27 23:35:56 +0100 |
| commit | ed1d366a23e4320e0dcee29c642c94e6ce491fd3 (patch) | |
| tree | b9f89b444f3abe5cf19b8d54c93829194bd6ace8 /CMakeLists.txt | |
| parent | 0db1f520c629455b4766c3d8f57a9767d7f6a98f (diff) | |
| parent | 8e473edd486e35cd80617db5220c89e933995a56 (diff) | |
| download | mariadb-git-ed1d366a23e4320e0dcee29c642c94e6ce491fd3.tar.gz | |
Merge mysql.com:/misc/mysql/mysql-5.0
into mysql.com:/misc/mysql/mysql-5.0-opt
CMakeLists.txt:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
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 55489da784c..37956204faa 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,6 +78,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") |