diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-10-26 21:54:41 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-10-27 19:45:44 +0000 |
| commit | d8cb6822bc7deecba26021368c2f08fa6bf59e58 (patch) | |
| tree | eb48bf7067dd462c88724b4ed3306ce255387d3b /cmake | |
| parent | aec43216c834c2156e9aca7b7dc182fbdd1916de (diff) | |
| download | mariadb-git-d8cb6822bc7deecba26021368c2f08fa6bf59e58.tar.gz | |
VS2015 build fixes
- new location of signtool
- silence a nonsensical warning from stl header
(complain about noexcept() function attribute, if /EHsc is not set)
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/install_macros.cmake | 1 | ||||
| -rw-r--r-- | cmake/os/Windows.cmake | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index 15e2dc4930b..22a525d7344 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -208,6 +208,7 @@ IF(WIN32) FIND_PROGRAM(SIGNTOOL_EXECUTABLE signtool PATHS "$ENV{ProgramFiles}/Microsoft SDKs/Windows/v7.0A/bin" "$ENV{ProgramFiles}/Windows Kits/8.0/bin/x86" + "$ENV{ProgramFiles}/Windows Kits/8.1/bin/x86" ) IF(NOT SIGNTOOL_EXECUTABLE) MESSAGE(FATAL_ERROR diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index e1055ab5894..283f79b3b41 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -120,7 +120,7 @@ IF(MSVC) #TODO: update the code and remove the disabled warnings SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /wd4291 /we4099") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /wd4291 /wd4577 /we4099") IF(CMAKE_SIZEOF_VOID_P MATCHES 8) # _WIN64 is defined by the compiler itself. |