From 36fffdeaa22c7208d3744613a7bd7bbe6e49b394 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <vvaintroub@mysql.com>
Date: Fri, 12 Nov 2010 13:42:50 +0100
Subject: 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.
---
 cmake/libutils.cmake | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'cmake/libutils.cmake')

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)
-- 
cgit v1.2.1