diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-16 14:45:06 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-16 14:45:06 +0100 |
| commit | a15d4127fd115069f4322a9ebd4db67af39c977f (patch) | |
| tree | 09f9f30fcdfb4307a317b6ef7c2c992c4910f260 /scripts | |
| parent | 20b785c0fb112da72979431f18654d4f93acdaa6 (diff) | |
| download | mariadb-git-a15d4127fd115069f4322a9ebd4db67af39c977f.tar.gz | |
Fixes for cmake2.8
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/CMakeLists.txt | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 0403a1bb5ae..8d246e6a38a 100755 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -76,13 +76,12 @@ SET(FIX_PRIVILEGES_SQL ) # Build mysql_fix_privilege_tables.sql (concatenate 2 sql scripts) -ADD_CUSTOM_COMMAND( - OUTPUT ${FIX_PRIVILEGES_SQL} - COMMAND ${CMAKE_COMMAND} "-DIN=${FIX_PRIVS_IN}" "-DOUT=${FIX_PRIVILEGES_SQL}" - -P "${CMAKE_SOURCE_DIR}/cmake/cat.cmake" - VERBATIM - DEPENDS ${FIX_PRIVS_IN} -) +FILE(WRITE ${FIX_PRIVILEGES_SQL} "") +FOREACH(FILENAME ${FIX_PRIVS_IN}) + FILE(READ "${FILENAME}" CONTENTS) + FILE(APPEND ${FIX_PRIVILEGES_SQL} "${CONTENTS}") +ENDFOREACH() + # Build mysql_fix_privilege_tables.c ADD_CUSTOM_COMMAND( @@ -91,7 +90,7 @@ ADD_CUSTOM_COMMAND( mysql_fix_privilege_tables mysql_fix_privilege_tables.sql mysql_fix_privilege_tables_sql.c - DEPENDS comp_sql ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables.sql + DEPENDS comp_sql WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) |