summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2010-01-31 16:36:03 +0100
committerunknown <knielsen@knielsen-hq.org>2010-01-31 16:36:03 +0100
commit7bd147960606a8c44cbdb9f7b08bba4887a37f18 (patch)
treefe3095770f3ba8d8f5095912748e3571bb985d1a
parent7cb11859c7ba09709546038078e0617da9fa9537 (diff)
parent756d0b864fbeeef22427901b9bc150fa24d2af13 (diff)
downloadmariadb-git-7bd147960606a8c44cbdb9f7b08bba4887a37f18.tar.gz
Automerge MariaDB 5.1.42 release branch into main.
-rw-r--r--libmysqld/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 7d2abb64065..9adf91c997b 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -153,7 +153,7 @@ FILE(WRITE cmake_dummy.c " ")
# 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})