diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-12 18:43:22 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-12 18:43:22 +0100 |
| commit | bbd4bb310d7b500a57be56b8f0501fa8eee6d40f (patch) | |
| tree | 9bed4e5f90d3397287797a68c92e6fc6409d6b21 /libmysqld | |
| parent | 92c0c410f38e04de812e3ed73bf687ec823e580a (diff) | |
| download | mariadb-git-bbd4bb310d7b500a57be56b8f0501fa8eee6d40f.tar.gz | |
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
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 600a0e90378..ed31cc756b4 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -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) |