diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
| commit | 711c318c072f6d5fd5c2877ccc736c7673d1711d (patch) | |
| tree | ac8b15ac65b08a492c256369b73e372f6568c7a4 /cmake/os | |
| parent | 00538253b592522babe3609af29cb3eb87218b64 (diff) | |
| parent | fd64a0db45705ca5eb2ad34ffc2ed1d9ef961017 (diff) | |
| download | mariadb-git-711c318c072f6d5fd5c2877ccc736c7673d1711d.tar.gz | |
Merge of mysql-trunk-bugfixing into mysql-trunk-merge.
Diffstat (limited to 'cmake/os')
| -rw-r--r-- | cmake/os/FreeBSD.cmake | 3 | ||||
| -rw-r--r-- | cmake/os/Windows.cmake | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cmake/os/FreeBSD.cmake b/cmake/os/FreeBSD.cmake index be7af778e93..e09592942c1 100644 --- a/cmake/os/FreeBSD.cmake +++ b/cmake/os/FreeBSD.cmake @@ -20,4 +20,5 @@ # #Legacy option, maybe not needed anymore , taken as is from autotools build # ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000) -ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH) +# The below was used for really old versions of FreeBSD, roughly: before 5.1.9 +# ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH) diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 3be739d3122..aac7e484f26 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -110,6 +110,10 @@ IF(MSVC) ADD_DEFINITIONS(/wd4996) ENDIF() + # Make class/struct definition mismatch an error (overseen too often, + # adds tons of new warnings) + ADD_DEFINITIONS(/we4099) + IF(CMAKE_SIZEOF_VOID_P MATCHES 8) # _WIN64 is defined by the compiler itself. # Yet, we define it here again to work around a bug with Intellisense |