database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-28 13:01:41 +03:00
Code

Workaround CMake bug http://www.vtk.org/Bug/view.php?id=11240

Browse Source 
Huge static libraries like libmysqld might not build if /MACHINE flag is missing 
for librarian with the correct processor architecture.

Fix is to add /MACHINE flag  for x64 builds
This commit is contained in:
Vladislav Vaintroub 2011-02-12 18:43:22 +01:00
parent 92c0c410f3
commit bbd4bb310d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmysqld/CMakeLists.txt
View File

@ -159,6 +159,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)