diff options
| author | unknown <Antony@floppy.> | 2007-03-22 00:43:14 -0700 |
|---|---|---|
| committer | unknown <Antony@floppy.> | 2007-03-22 00:43:14 -0700 |
| commit | 2b9fdea8c6eff96b938dfd0a47331a02ca186760 (patch) | |
| tree | a483abdfae7bb71c7e9521103ae6fc24ee39cbe5 /CMakeLists.txt | |
| parent | caa6ddd9a436d3adaf3429f0664c486ec88aa9cd (diff) | |
| download | mariadb-git-2b9fdea8c6eff96b938dfd0a47331a02ca186760.tar.gz | |
Fixes for 5.1-arch repository to compile on Windows.
CMakeLists.txt:
Moved zlib to be processed before extra as CMake doesn't handle
forward references well.
client/CMakeLists.txt:
Ensure that -DTHREADS is specified for mysqlslap.c
client/mysqlslap.c:
Removed includes which are already included in client_priv.h
Moved variable declarations to be at start of function before any
code is emitted as VSC is strict.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eb4d77db73f..48992cf574b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,10 +131,10 @@ ADD_SUBDIRECTORY(dbug) ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(regex) ADD_SUBDIRECTORY(mysys) +ADD_SUBDIRECTORY(zlib) ADD_SUBDIRECTORY(extra/yassl) ADD_SUBDIRECTORY(extra/yassl/taocrypt) ADD_SUBDIRECTORY(extra) -ADD_SUBDIRECTORY(zlib) ADD_SUBDIRECTORY(storage/heap) ADD_SUBDIRECTORY(storage/myisam) ADD_SUBDIRECTORY(storage/myisammrg) |