maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Kristian Nielsen (knielsen)
------------------------------------------------------------
revno: 2812 [merge]
committer: knielsen@xxxxxxxxxxxxxxx
branch nick: work-5.1
timestamp: Sun 2010-01-31 16:36:03 +0100
message:
  Automerge MariaDB 5.1.42 release branch into main.
modified:
  libmysqld/CMakeLists.txt


--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

=== modified file 'libmysqld/CMakeLists.txt'
--- libmysqld/CMakeLists.txt	2009-12-03 11:19:05 +0000
+++ libmysqld/CMakeLists.txt	2010-01-31 09:13:21 +0000
@@ -153,7 +153,7 @@
 # custom targets to "sql/CMakeLists.txt" and reference them here.
 ADD_LIBRARY(mysqlserver STATIC ${LIBMYSQLD_SOURCES})
 ADD_DEPENDENCIES(mysqlserver GenServerSource GenError)
-TARGET_LINK_LIBRARIES(mysqlserver)
+TARGET_LINK_LIBRARIES(mysqlserver psapi.lib)
 
 # Add any additional libraries requested by engine(s)
 FOREACH (ENGINE_LIB ${MYSQLD_STATIC_ENGINE_LIBS})