diff options
| author | unknown <knielsen@mysql.com> | 2006-02-22 10:19:45 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-02-22 10:19:45 +0100 |
| commit | ed7c25364dbf176b2ed3a53b0a0d085fc839c164 (patch) | |
| tree | 61259abc4167f074d5e6ee1afb7e274de7827c1d /win/cmakefiles/sql | |
| parent | 6fcff14cdbd289115616d82be11d248d65996618 (diff) | |
| parent | 86df81d8c332252fff33427fc860cd204e944f38 (diff) | |
| download | mariadb-git-ed7c25364dbf176b2ed3a53b0a0d085fc839c164.tar.gz | |
Merge mysqldev@win2003-x86:my/mysql-5.1-new
into mysql.com:/usr/local/mysql/tmpbuild-5.1
mysql-test/mysql-test-run.pl:
Auto merged
win/cmakefiles/sql:
Auto merged
Diffstat (limited to 'win/cmakefiles/sql')
| -rw-r--r-- | win/cmakefiles/sql | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win/cmakefiles/sql b/win/cmakefiles/sql index a74fd4e79ca..72a71cbf14f 100644 --- a/win/cmakefiles/sql +++ b/win/cmakefiles/sql @@ -76,14 +76,14 @@ ADD_CUSTOM_COMMAND( #ADD_CUSTOM_COMMAND( # SOURCE ${PROJECT_SOURCE_DIR}/include/mysql_version.h.in # OUTPUT ${PROJECT_SOURCE_DIR}/include/mysql_version.h -# COMMAND ${PROJECT_SOURCE_DIR}/win/config-version.js +# COMMAND cscript.exe ${PROJECT_SOURCE_DIR}/win/config-version.js # DEPENDS ${PROJECT_SOURCE_DIR}/include/mysql_version.h.in) # Handlerton file ADD_CUSTOM_COMMAND( SOURCE ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in OUTPUT ${PROJECT_SOURCE_DIR}/sql/handlerton.cc - COMMAND ${PROJECT_SOURCE_DIR}/win/config-handlerton.js ARGS ${PROJECT_SOURCE_DIR}/win/configure.data + COMMAND cscript.exe ${PROJECT_SOURCE_DIR}/win/config-handlerton.js ARGS ${PROJECT_SOURCE_DIR}/win/configure.data DEPENDS ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in) # Error file |