bzr commit into mysql-5.1-bugteam branch (vvaintroub:2841) Bug#43715

[Vladislav Vaintroub]

#At file:///G:/bzr/mysql-5.1-bugteam/ based on
revid:azundris@stripped

 2841 Vladislav Vaintroub	2009-03-17
      Bug #43715 Link errors when trying to link mysql_embedded.exe
      
      The reason for the error is incorrectly specified link dependencies
      for mysql_embedded, mysqltest_embedded and mysql_client_test_embedded
      in CMakeLists.txt (ADD_DEPENDENCIES should be TARGET_LINK_LIBRARIES)
     @ libmysqld/CMakeLists.txt
        changed library type for libmysqld to SHARED instead of
        MODULE. MODULE in CMake notation is a shared library that 
        is used only in dlopen/dlsym/LoadLibrary scenarios.
        Hence it was impossible to use TARGET_LINK_LIBRARIES with
        a MODULE.
     @ libmysqld/examples/CMakeLists.txt
        Use TARGET_LINK_LIBRARIES (instead of previously incorrectly 
        used ADD_DEPENDENCIES) to specify link dependency from libmysqld

    modified:
      libmysqld/CMakeLists.txt
      libmysqld/examples/CMakeLists.txt
=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2008-06-18 16:17:15 +0000
+++ b/libmysqld/CMakeLists.txt	2009-03-17 22:28:24 +0000
@@ -201,6 +201,6 @@ ADD_LIBRARY(mysqlserver STATIC ${LIBMYSQ
 ADD_DEPENDENCIES(mysqlserver GenServerSource GenError)
 TARGET_LINK_LIBRARIES(mysqlserver)
 
-ADD_LIBRARY(libmysqld MODULE cmake_dummy.c libmysqld.def)
+ADD_LIBRARY(libmysqld SHARED cmake_dummy.c libmysqld.def)
 ADD_DEPENDENCIES(libmysqld mysqlserver)
 TARGET_LINK_LIBRARIES(libmysqld mysqlserver wsock32)

=== modified file 'libmysqld/examples/CMakeLists.txt'
--- a/libmysqld/examples/CMakeLists.txt	2008-12-18 18:36:01 +0000
+++ b/libmysqld/examples/CMakeLists.txt	2009-03-17 22:28:24 +0000
@@ -30,12 +30,12 @@ ADD_EXECUTABLE(mysql_embedded ../../clie
                ../../client/mysql.cc ../../client/readline.cc
                ../../client/sql_string.cc)
 TARGET_LINK_LIBRARIES(mysql_embedded debug dbug strings mysys vio yassl taocrypt regex
ws2_32)
-ADD_DEPENDENCIES(mysql_embedded libmysqld)
+TARGET_LINK_LIBRARIES(mysql_embedded libmysqld)
 
 ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc)
 TARGET_LINK_LIBRARIES(mysqltest_embedded debug dbug strings mysys vio yassl taocrypt
regex ws2_32)
-ADD_DEPENDENCIES(mysqltest_embedded libmysqld)
+TARGET_LINK_LIBRARIES(mysqltest_embedded libmysqld)
 
 ADD_EXECUTABLE(mysql_client_test_embedded ../../tests/mysql_client_test.c)
 TARGET_LINK_LIBRARIES(mysql_client_test_embedded debug dbug strings mysys vio yassl
taocrypt regex ws2_32)
-ADD_DEPENDENCIES(mysql_client_test_embedded libmysqld)
+TARGET_LINK_LIBRARIES(mysql_client_test_embedded libmysqld)


Attachment: [text/bzr-bundle] bzr/[e-mail]