summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authoriggy@alf. <>2007-04-24 12:50:28 -0400
committeriggy@alf. <>2007-04-24 12:50:28 -0400
commitb2bf19354c169ccea142432e8728d0c4d4fafd5a (patch)
tree6176f4efbd84f43e8f1bbc519cb2ea66d73b8781 /scripts
parentb841154e6558587206d81832338f9bd6ec29dda6 (diff)
parent0f43ac0d2acd5bcbdbf2c54fe671aab4226b30f8 (diff)
downloadmariadb-git-b2bf19354c169ccea142432e8728d0c4d4fafd5a.tar.gz
Merge alf.:D:/src/mysql-5.1-maint
into alf.:D:/src/mysql-5.1-maint_pt
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/CMakeLists.txt14
1 files changed, 12 insertions, 2 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index bca0581ecbc..e9113b098da 100755
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -13,20 +13,30 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Build mysql_fix_privilege_tables.sql
+ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables.sql
+ COMMAND copy /b
+ mysql_system_tables.sql + mysql_system_tables_fix.sql
+ mysql_fix_privilege_tables.sql
+ DEPENDS
+ ${PROJECT_SOURCE_DIR}/scripts/mysql_system_tables.sql
+ ${PROJECT_SOURCE_DIR}/scripts/mysql_system_tables_fix.sql)
+# Build comp_sql - used for embedding SQL in C or C++ programs
ADD_EXECUTABLE(comp_sql comp_sql.c)
TARGET_LINK_LIBRARIES(comp_sql dbug mysys strings)
-# Build comp_sql - used for embedding SQL in C or C++ programs
+# Use comp_sql to build mysql_fix_privilege_tables_sql.c
GET_TARGET_PROPERTY(COMP_SQL_EXE comp_sql LOCATION)
ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables_sql.c
COMMAND ${COMP_SQL_EXE}
mysql_fix_privilege_tables
mysql_fix_privilege_tables.sql
- mysql_fix_privilege_tables_sql.c
+ mysql_fix_privilege_tables_sql.c
DEPENDS comp_sql ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables.sql)
+# Add dummy target for the above to be built
ADD_CUSTOM_TARGET(GenFixPrivs
ALL
DEPENDS ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables_sql.c)