diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-03-08 11:12:12 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-03-08 11:20:03 +0000 |
| commit | 65ef8ec8aafc09c4bee91e170aa2a9c0e0668a8f (patch) | |
| tree | bf9401c97aae7b81ba3c43a78bb91feeb1b4812c /cmake/mysql_add_executable.cmake | |
| parent | f65c9f825d164cf79dd6d5897ef144abba40ff6d (diff) | |
| download | mariadb-git-65ef8ec8aafc09c4bee91e170aa2a9c0e0668a8f.tar.gz | |
MDEV-12207 Include windows compatibility manifest into executable to make GetVersionEx work correctly
Diffstat (limited to 'cmake/mysql_add_executable.cmake')
| -rw-r--r-- | cmake/mysql_add_executable.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake index 0c93fb179f5..45575bdd536 100644 --- a/cmake/mysql_add_executable.cmake +++ b/cmake/mysql_add_executable.cmake @@ -38,6 +38,14 @@ FUNCTION (MYSQL_ADD_EXECUTABLE) SET(sources ${ARG_DEFAULT_ARGS}) ADD_VERSION_INFO(${target} EXECUTABLE sources) + + IF(MSVC) + # Add compatibility manifest, to fix GetVersionEx on Windows 8.1 and later + IF (CMAKE_VERSION VERSION_GREATER 3.3) + SET(sources ${sources} ${PROJECT_SOURCE_DIR}/cmake/win_compatibility.manifest) + ENDIF() + ENDIF() + ADD_EXECUTABLE(${target} ${ARG_WIN32} ${ARG_MACOSX_BUNDLE} ${ARG_EXCLUDE_FROM_ALL} ${sources}) # tell CPack where to install IF(NOT ARG_EXCLUDE_FROM_ALL) |