summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreggie@big_geek. <>2006-04-10 19:48:16 -0500
committerreggie@big_geek. <>2006-04-10 19:48:16 -0500
commit8b7526db77656d4d08c34a870a879401460608ce (patch)
tree82cab49c6dc0dd9e7a6547325dca627552943f58
parent0f9676426c000b7b7b0e78e9762a3b10fad8d307 (diff)
parented6ff9cd403ee80a6395336b7f75a5527f93c743 (diff)
downloadmariadb-git-8b7526db77656d4d08c34a870a879401460608ce.tar.gz
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into big_geek.:C:/Work/mysql/mysql-5.1-test
-rw-r--r--libmysqld/cmakelists.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/libmysqld/cmakelists.txt b/libmysqld/cmakelists.txt
index a11a0dffd33..8bd0e0baa32 100644
--- a/libmysqld/cmakelists.txt
+++ b/libmysqld/cmakelists.txt
@@ -20,6 +20,10 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/zlib
)
+SET_SOURCE_FILES_PROPERTIES(${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
+ ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
+ PROPERTIES GENERATED 1)
+
ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc
../client/get_password.c ../libmysql/errmsg.c
../libmysql/libmysql.c ../sql/password.c ../sql-common/client.c
@@ -54,11 +58,13 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc
../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_string.cc
../sql/sql_tablespace.cc ../sql/sql_table.cc ../sql/sql_test.cc
../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc
- ../sql/sql_update.cc ../sql/sql_view.cc ../sql/sql_yacc.cc
+ ../sql/sql_update.cc ../sql/sql_view.cc
../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc
../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
../sql/partition_info.cc ../vio/vio.c
- ../vio/viosocket.c ../vio/viossl.c ../vio/viosslfactories.c)
+ ../vio/viosocket.c ../vio/viossl.c ../vio/viosslfactories.c
+ ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
+ ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h)
# Seems we cannot make a library without at least one source file. So use a
# dummy empty file