bzr push into mysql-trunk-merge branch (tor.didriksen:3226 to 3227) WL#1054

[Tor Didriksen]

 3227 Tor Didriksen	2010-10-05
      WL#1054 post-push fix, the 're' test executable now depends on mysys library
     @ regex/CMakeLists.txt
        Add dependency on mysys library

    modified:
      regex/CMakeLists.txt
 3226 Vladislav Vaintroub	2010-10-05 [merge]
      merge

    modified:
      include/my_global.h
=== modified file 'regex/CMakeLists.txt'
--- a/regex/CMakeLists.txt	2010-08-12 15:27:53 +0000
+++ b/regex/CMakeLists.txt	2010-10-05 06:33:15 +0000
@@ -19,7 +19,7 @@ SET(REGEX_SOURCES regcomp.c regerror.c r
 ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES})
 
 ADD_EXECUTABLE(re main.c split.c debug.c)
-TARGET_LINK_LIBRARIES(re regex strings)
+TARGET_LINK_LIBRARIES(re regex strings mysys)
 
 ADD_TEST(regex1 re     -i${CMAKE_CURRENT_SOURCE_DIR}/tests)
 ADD_TEST(regex2 re -el -i${CMAKE_CURRENT_SOURCE_DIR}/tests)


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