[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2812)
#At lp:maria 2812 knielsen@knielsen-hq.org 2010-01-31 [merge] Automerge MariaDB 5.1.42 release branch into main. modified: libmysqld/CMakeLists.txt === modified file 'libmysqld/CMakeLists.txt' --- a/libmysqld/CMakeLists.txt 2009-12-03 11:19:05 +0000 +++ b/libmysqld/CMakeLists.txt 2010-01-31 09:13:21 +0000 @@ -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})
participants (1)
-
knielsen@knielsen-hq.org