Commit bbd4bb31 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

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

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
parent 92c0c410
...@@ -159,6 +159,12 @@ ADD_LIBRARY(mysqlserver STATIC ${LIBMYSQLD_SOURCES}) ...@@ -159,6 +159,12 @@ ADD_LIBRARY(mysqlserver STATIC ${LIBMYSQLD_SOURCES})
ADD_DEPENDENCIES(mysqlserver GenServerSource GenError) ADD_DEPENDENCIES(mysqlserver GenServerSource GenError)
TARGET_LINK_LIBRARIES(mysqlserver psapi.lib) 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) # Add any additional libraries requested by engine(s)
FOREACH (ENGINE_LIB ${MYSQLD_STATIC_ENGINE_LIBS}) FOREACH (ENGINE_LIB ${MYSQLD_STATIC_ENGINE_LIBS})
STRING(TOUPPER ${ENGINE_LIB} ENGINE_LIB_UPPER) STRING(TOUPPER ${ENGINE_LIB} ENGINE_LIB_UPPER)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment