Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
30f50918
Commit
30f50918
authored
Feb 01, 2011
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
workaround CMake bug 11240 (problems making mysqlserver.lib on Win64)
parent
b2a15f73
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
libmysqld/CMakeLists.txt
libmysqld/CMakeLists.txt
+7
-1
No files found.
libmysqld/CMakeLists.txt
View file @
30f50918
...
...
@@ -98,7 +98,7 @@ ENDFOREACH(ENGINE_LIB)
SET
(
SOURCE_SUBLIBS FALSE
)
SET
(
LIBMYSQLD_SOURCES
emb_qcache.cc libmysqld.
c lib_sql.cc
SET
(
LIBMYSQLD_SOURCES
libmysqld.c emb_qcache.c
c lib_sql.cc
../libmysql/libmysql.c ../libmysql/errmsg.c ../client/get_password.c
../sql-common/client.c ../sql-common/my_time.c
../sql-common/my_user.c ../sql-common/pack.c
...
...
@@ -155,6 +155,12 @@ ADD_LIBRARY(mysqlserver STATIC ${LIBMYSQLD_SOURCES})
ADD_DEPENDENCIES
(
mysqlserver GenServerSource GenError
)
TARGET_LINK_LIBRARIES
(
mysqlserver psapi.lib
)
IF
(
MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8
)
# Workaround cmake bug http://www.vtk.org/Bug/view.php?id=11240
SET_TARGET_PROPERTIES
(
mysqlserver PROPERTIES STATIC_LIBRARY_FLAGS
"/MACHINE:AMD64"
)
ENDIF
()
# Add any additional libraries requested by engine(s)
FOREACH
(
ENGINE_LIB
${
MYSQLD_STATIC_ENGINE_LIBS
}
)
STRING
(
TOUPPER
${
ENGINE_LIB
}
ENGINE_LIB_UPPER
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment