diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-05-10 18:18:25 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-05-10 18:18:25 +0200 |
| commit | 27fb650b8bc53a9bad060230e054b303364aeb1e (patch) | |
| tree | ccbcceacf9234f44481303db3faa36cad7170cf9 | |
| parent | 11411f5b6ca747df3e650c1e452bc601b157f50e (diff) | |
| download | mariadb-git-27fb650b8bc53a9bad060230e054b303364aeb1e.tar.gz | |
Fix Windows embedded warnings
| -rw-r--r-- | libmysqld/libmysqld.def | 1 | ||||
| -rw-r--r-- | storage/xtradb/CMakeLists.txt | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def index 754aa6b3c29..08325cc6180 100644 --- a/libmysqld/libmysqld.def +++ b/libmysqld/libmysqld.def @@ -1,5 +1,4 @@ LIBRARY LIBMYSQLD -DESCRIPTION 'MySQL 5.1 Embedded Server Library' VERSION 5.1 EXPORTS mysql_thread_end diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt index 9782f43fb27..509f7f0fe73 100644 --- a/storage/xtradb/CMakeLists.txt +++ b/storage/xtradb/CMakeLists.txt @@ -48,10 +48,11 @@ IF(MSVC) SET_SOURCE_FILES_PROPERTIES(mem/mem0mem.c mem/mem0pool.c PROPERTIES COMPILE_FLAGS -Od) ENDIF() - # Avoid "unreferenced label" warning in generated file - SET_SOURCE_FILES_PROPERTIES(pars/pars0grm.c + # Avoid "unreferenced label" warning in generated file + GET_FILENAME_COMPONENT(_SRC_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) + SET_SOURCE_FILES_PROPERTIES(${_SRC_DIR}/pars/pars0grm.c PROPERTIES COMPILE_FLAGS "/wd4102") - SET_SOURCE_FILES_PROPERTIES(pars/lexyy.c + SET_SOURCE_FILES_PROPERTIES(${_SRC_DIR}/pars/lexyy.c PROPERTIES COMPILE_FLAGS "/wd4003") ENDIF() |