diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2008-10-23 17:59:22 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2008-10-23 17:59:22 +0200 |
| commit | 0d220ba7caf43f1f951d8a81a2f5bd78ffadaf78 (patch) | |
| tree | ae11893b169d1eee189a715dbe3a6c4b8f09b39b /sql/CMakeLists.txt | |
| parent | f698f0b32e3e6699a66ae6e9e79d5fce54602034 (diff) | |
| parent | 49ff055736b3b613005e5b17915d08fe48b7b532 (diff) | |
| download | mariadb-git-0d220ba7caf43f1f951d8a81a2f5bd78ffadaf78.tar.gz | |
merge fix for Bug40280 from 5.0
Diffstat (limited to 'sql/CMakeLists.txt')
| -rwxr-xr-x | sql/CMakeLists.txt | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 5ab29aff69c..cfd049e1864 100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -27,9 +27,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib ) -SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc - ${CMAKE_SOURCE_DIR}/sql/message.h - ${CMAKE_SOURCE_DIR}/sql/sql_yacc.h +SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/sql_yacc.h ${CMAKE_SOURCE_DIR}/sql/sql_yacc.cc ${CMAKE_SOURCE_DIR}/include/mysql_version.h ${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc @@ -135,14 +133,6 @@ ADD_CUSTOM_COMMAND( --output=sql_yacc.cc sql_yacc.yy DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.yy) -IF(WIN32) - # Windows message file - ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_SOURCE_DIR}/sql/message.h -# ${PROJECT_SOURCE_DIR}/sql/message.rc - COMMAND mc ARGS message.mc - DEPENDS ${PROJECT_SOURCE_DIR}/sql/message.mc) -ENDIF(WIN32) # Gen_lex_hash ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) @@ -165,7 +155,7 @@ ADD_DEPENDENCIES(mysqld GenServerSource) # Remove the auto-generated files as part of 'Clean Solution' SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES - "lex_hash.h;message.rc;message.h;sql_yacc.h;sql_yacc.cc") + "lex_hash.h;sql_yacc.h;sql_yacc.cc") ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def) ADD_DEPENDENCIES(udf_example strings GenError) |