diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-13 13:53:59 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-13 13:53:59 -0500 |
| commit | ee8b5c305a2334d06fe999b2db441d0436f9f423 (patch) | |
| tree | fb613fed64234c3e211d2ae01272e1f31ca19138 /cmake | |
| parent | 11544334a277508fb984c0a5bba8faa6b97a2762 (diff) | |
| parent | 4f5338467807f099b67f07d0bfb415358222a2b1 (diff) | |
| download | mariadb-git-ee8b5c305a2334d06fe999b2db441d0436f9f423.tar.gz | |
Merge tag 'mariadb-10.0.29' into 10.0-galera
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/install_macros.cmake | 1 | ||||
| -rw-r--r-- | cmake/os/Windows.cmake | 2 | ||||
| -rw-r--r-- | cmake/readline.cmake | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index e16467619c7..24659781b26 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -233,6 +233,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 1ad7e5c288d..84276115723 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -116,7 +116,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. diff --git a/cmake/readline.cmake b/cmake/readline.cmake index c72f8d0da5c..64e04ef8663 100644 --- a/cmake/readline.cmake +++ b/cmake/readline.cmake @@ -230,5 +230,6 @@ MACRO (MYSQL_CHECK_READLINE) SET(CMAKE_REQUIRED_LIBRARIES) SET(CMAKE_REQUIRED_INCLUDES) ENDIF(NOT WIN32) + CHECK_INCLUDE_FILES ("curses.h;term.h" HAVE_TERM_H) ENDMACRO() |