diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-01 01:58:37 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-01 01:58:37 +0100 |
| commit | 30f509187a1df38b41dd6b06c17a78dcabd84965 (patch) | |
| tree | ea593ba6478624333f093bb5288db1ab65027de5 /libmysqld | |
| parent | b2a15f73ceac2d89c1f7b92254c5b0f3cb3d4bc7 (diff) | |
| download | mariadb-git-30f509187a1df38b41dd6b06c17a78dcabd84965.tar.gz | |
workaround CMake bug 11240 (problems making mysqlserver.lib on Win64)
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 18ac1af9516..44360b5dd44 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -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.cc 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) |