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 /cmake/create_initial_db.cmake.in | |
| parent | 20b785c0fb112da72979431f18654d4f93acdaa6 (diff) | |
| download | mariadb-git-a15d4127fd115069f4322a9ebd4db67af39c977f.tar.gz | |
Fixes for cmake2.8
Diffstat (limited to 'cmake/create_initial_db.cmake.in')
| -rw-r--r-- | cmake/create_initial_db.cmake.in | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/cmake/create_initial_db.cmake.in b/cmake/create_initial_db.cmake.in index 92ebc72d425..649d96a6627 100644 --- a/cmake/create_initial_db.cmake.in +++ b/cmake/create_initial_db.cmake.in @@ -19,16 +19,14 @@ SET(CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@") SET(MYSQLD_EXECUTABLE "@MYSQLD_EXECUTABLE@") SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@") SET(WIN32 "@WIN32@") -SET ($ENV{VS_UNICODE_OUTPUT}) -IF(CMAKE_CFG_INTDIR) - IF(CONFIG) - MESSAGE(${CONFIG}) - #Resolve build configuration variables - STRING(REPLACE "${CMAKE_CFG_INTDIR}" ${CONFIG} MYSQLD_EXECUTABLE - "${MYSQLD_EXECUTABLE}") - ELSE() - MESSAGE(FATAL_ERROR "Please provide CONFIG parameter to the script") - ENDIF() +# Force Visual Studio to output to stdout +IF(ENV{VS_UNICODE_OUTPUT}) + SET ($ENV{VS_UNICODE_OUTPUT}) +ENDIF() +IF(CMAKE_CFG_INTDIR AND CONFIG) + #Resolve build configuration variables + STRING(REPLACE "${CMAKE_CFG_INTDIR}" ${CONFIG} MYSQLD_EXECUTABLE + "${MYSQLD_EXECUTABLE}") ENDIF() # Create bootstrapper SQL script @@ -44,9 +42,8 @@ FOREACH(FILENAME mysql_system_tables.sql mysql_system_tables_data.sql ENDFOREACH() -MAKE_DIRECTORY(data) -FILE(REMOVE_RECURSE data/mysql) -MAKE_DIRECTORY(data/mysql) +FILE(REMOVE_RECURSE mysql) +MAKE_DIRECTORY(mysql) IF(WIN32) SET(CONSOLE --console) ENDIF() |