diff options
| author | unknown <iggy@recycle.(none)> | 2007-04-23 16:23:32 -0400 |
|---|---|---|
| committer | unknown <iggy@recycle.(none)> | 2007-04-23 16:23:32 -0400 |
| commit | 7ad5d7c1efdaefc98d1fd9a1943cd70a7b6e835d (patch) | |
| tree | c97ca12e6aef03d8d4bfc224962e2081cf8ed86f /win | |
| parent | 917f89ceb693c4fbaa0d459007d70363db366d8c (diff) | |
| download | mariadb-git-7ad5d7c1efdaefc98d1fd9a1943cd70a7b6e835d.tar.gz | |
Bug#24732 Executables do not include Vista manifests
- Post merge cleanup.
CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Added logic for EMBED_MANIFESTS configuration option.
client/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for client executables.
extra/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for my_print_default executable.
libmysql/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for myTest executable.
server-tools/instance-manager/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for mysqlmanager executable.
sql/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for mysqld executable.
storage/myisam/CMakeLists.txt:
Bug#24732 Executables do not include Vista manifests
- Embed manifest with custom CMake MACRO for myisam executables.
win/README:
Bug#24732 Executables do not include Vista manifests
- Added new configuration option documentation.
win/configure.js:
Bug#24732 Executables do not include Vista manifests
- Added new EMBED_MANIFESTS configuration option.
Diffstat (limited to 'win')
| -rw-r--r-- | win/README | 4 | ||||
| -rw-r--r-- | win/configure.js | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/win/README b/win/README index 88677029e0b..1e45b92abb2 100644 --- a/win/README +++ b/win/README @@ -58,7 +58,9 @@ The options right now are MYSQL_SERVER_SUFFIX=<suffix> Server suffix, default none COMPILATION_COMMENT=<comment> Server comment, default "Source distribution" MYSQL_TCP_PORT=<port> Server port, default 3306 - CYBOZU Default character set is UTF8 + CYBOZU Default character set is UTF8 + EMBED_MANIFESTS Embed custom manifests into final exes, otherwise VS + default will be used. So the command line could look like: diff --git a/win/configure.js b/win/configure.js index 7080c457965..7225fff119b 100644 --- a/win/configure.js +++ b/win/configure.js @@ -46,6 +46,7 @@ try case "WITH_PARTITION_STORAGE_ENGINE": case "__NT__": case "CYBOZU": + case "EMBED_MANIFESTS": configfile.WriteLine("SET (" + args.Item(i) + " TRUE)"); break; case "MYSQL_SERVER_SUFFIX": |