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/libutils.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/libutils.cmake')
| -rw-r--r-- | cmake/libutils.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index 0cc8895f43e..89eb5a74d80 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -250,6 +250,9 @@ MACRO(MERGE_LIBRARIES) ENDFOREACH() ENDIF() CREATE_EXPORT_FILE(SRC ${TARGET} "${ARG_EXPORTS}") + IF(NOT ARG_NOINSTALL) + ADD_VERSION_INFO(${TARGET} SHARED SRC) + ENDIF() ADD_LIBRARY(${TARGET} ${LIBTYPE} ${SRC}) TARGET_LINK_LIBRARIES(${TARGET} ${LIBS}) IF(ARG_OUTPUT_NAME) |