diff options
| author | msvensson@pilot.mysql.com <> | 2008-04-03 11:50:43 +0200 |
|---|---|---|
| committer | msvensson@pilot.mysql.com <> | 2008-04-03 11:50:43 +0200 |
| commit | a011d27cf95ecf401385bdfff4950d1e28f6df84 (patch) | |
| tree | abcc5a4053c601e7cce25995bc6169db4e48d8c2 /CMakeLists.txt | |
| parent | f1312d30bba46b199ca94eaa44153bf2c6f99545 (diff) | |
| parent | 70827ee13ec0574ec01be123bbf76943e67e1853 (diff) | |
| download | mariadb-git-a011d27cf95ecf401385bdfff4950d1e28f6df84.tar.gz | |
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 32eed9d39c7..6ac87be249b 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") @@ -153,6 +157,14 @@ IF(WIN32) ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE") ENDIF(WIN32) +# This definition is necessary to work around a bug with Intellisense described +# here: http://tinyurl.com/2cb428. Syntax highlighting is important for proper +# debugger functionality. +IF(CMAKE_SIZEOF_VOID_P MATCHES 8) + MESSAGE(STATUS "Detected 64-bit platform.") + ADD_DEFINITIONS("-D_WIN64") +ENDIF(CMAKE_SIZEOF_VOID_P MATCHES 8) + IF(EMBED_MANIFESTS) # Search for the tools (mt, makecat, signtool) necessary for embedding # manifests and signing executables with the MySQL AB authenticode cert. |