diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-11-12 13:42:50 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-11-12 13:42:50 +0100 |
| commit | 36fffdeaa22c7208d3744613a7bd7bbe6e49b394 (patch) | |
| tree | 2a9de33eb5ae75bb7de7ffa7ac486e42126b9bca /cmake/mysql_add_executable.cmake | |
| parent | 5a8b8b6493b11a07973f5ee16885a9d8b9cbb456 (diff) | |
| download | mariadb-git-36fffdeaa22c7208d3744613a7bd7bbe6e49b394.tar.gz | |
Bug#58074: ADD_VERSION_INFO cmake/mysql_version.cmake fails if LINK_FLAGS are modified
Backport version info handling (Windows-specific) from next-mr.
Instead of adding ".res" object as linker flag, add resource file (.rc) file to the source list.
This is more obvious and less error prone method.
Diffstat (limited to 'cmake/mysql_add_executable.cmake')
| -rw-r--r-- | cmake/mysql_add_executable.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake index b49a737716c..ac812fbcdfd 100644 --- a/cmake/mysql_add_executable.cmake +++ b/cmake/mysql_add_executable.cmake @@ -37,7 +37,7 @@ FUNCTION (MYSQL_ADD_EXECUTABLE) LIST(REMOVE_AT ARG_DEFAULT_ARGS 0)
SET(sources ${ARG_DEFAULT_ARGS})
-
+ ADD_VERSION_INFO(${target} EXECUTABLE sources)
ADD_EXECUTABLE(${target} ${ARG_WIN32} ${ARG_MACOSX_BUNDLE} ${ARG_EXCLUDE_FROM_ALL} ${sources})
# tell CPack where to install
IF(NOT ARG_EXCLUDE_FROM_ALL)
|