Commit c94a5cd5 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix configure.js : set the variabes in cache, so they can overwrite cache...

Fix configure.js : set the variabes in cache, so they can overwrite cache variables in CMakeLists.txt
parent e4cb186c
...@@ -44,12 +44,12 @@ try ...@@ -44,12 +44,12 @@ try
case "EXTRA_DEBUG": case "EXTRA_DEBUG":
case "WITH_EMBEDDED_SERVER": case "WITH_EMBEDDED_SERVER":
case "WITHOUT_ATOMICS": case "WITHOUT_ATOMICS":
configfile.WriteLine("SET (" + args.Item(i) + " TRUE)"); configfile.WriteLine("SET (" + args.Item(i) + " TRUE CACHE BOOL \"\")");
break; break;
case "MYSQL_SERVER_SUFFIX": case "MYSQL_SERVER_SUFFIX":
case "MYSQLD_EXE_SUFFIX": case "MYSQLD_EXE_SUFFIX":
configfile.WriteLine("SET (" + parts[0] + " \"" configfile.WriteLine("SET (" + parts[0] + " \""
+ parts[1] + "\")"); + parts[1] + "\" CACHE STRING \"\")");
break; break;
case "COMPILATION_COMMENT": case "COMPILATION_COMMENT":
default_comment = parts[1]; default_comment = parts[1];
...@@ -93,26 +93,26 @@ try ...@@ -93,26 +93,26 @@ try
} }
configfile.WriteLine("SET (COMPILATION_COMMENT \"" + configfile.WriteLine("SET (COMPILATION_COMMENT \"" +
default_comment + "\")"); default_comment + "\" CACHE STRING \"\" )");
configfile.WriteLine("SET (PROTOCOL_VERSION \"" + configfile.WriteLine("SET (PROTOCOL_VERSION \"" +
GetValue(configureIn, "PROTOCOL_VERSION") + "\")"); GetValue(configureIn, "PROTOCOL_VERSION") + "\" CACHE STRING \"\")");
configfile.WriteLine("SET (DOT_FRM_VERSION \"" + configfile.WriteLine("SET (DOT_FRM_VERSION \"" +
GetValue(configureIn, "DOT_FRM_VERSION") + "\")"); GetValue(configureIn, "DOT_FRM_VERSION") + "\" CACHE STRING \"\")");
configfile.WriteLine("SET (MYSQL_TCP_PORT_DEFAULT \"" + default_port + "\")"); configfile.WriteLine("SET (MYSQL_TCP_PORT_DEFAULT \"" + default_port + "\" CACHE STRING \"\")");
configfile.WriteLine("SET (MYSQL_TCP_PORT \"" + actual_port + "\")"); configfile.WriteLine("SET (MYSQL_TCP_PORT \"" + actual_port + "\" CACHE STRING \"\")");
configfile.WriteLine("SET (MYSQL_UNIX_ADDR \"" + configfile.WriteLine("SET (MYSQL_UNIX_ADDR \"" +
GetValue(configureIn, "MYSQL_UNIX_ADDR_DEFAULT") + "\")"); GetValue(configureIn, "MYSQL_UNIX_ADDR_DEFAULT") + "\" CACHE STRING \"\")");
var version = GetVersion(configureIn); var version = GetVersion(configureIn);
configfile.WriteLine("SET (VERSION \"" + version + "\")"); configfile.WriteLine("SET (VERSION \"" + version + "\" CACHE STRING \"\")");
configfile.WriteLine("SET (MYSQL_BASE_VERSION \"" + configfile.WriteLine("SET (MYSQL_BASE_VERSION \"" +
GetBaseVersion(version) + "\")"); GetBaseVersion(version) + "\" CACHE STRING \"\")");
configfile.WriteLine("SET (MYSQL_VERSION_ID \"" + configfile.WriteLine("SET (MYSQL_VERSION_ID \"" +
GetVersionId(version) + "\")"); GetVersionId(version) + "\" CACHE STRING \"\")");
var engineOptions = ParsePlugins(); var engineOptions = ParsePlugins();
for (option in engineOptions) for (option in engineOptions)
{ {
configfile.WriteLine("SET(" + engineOptions[option] + " TRUE)"); configfile.WriteLine("SET(" + engineOptions[option] + " TRUE CACHE BOOL \"\")");
} }
configfile.Close(); configfile.Close();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment