diff options
| author | unknown <knielsen@mysql.com> | 2006-03-28 10:07:03 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-03-28 10:07:03 +0200 |
| commit | fa780d44c64df04bb78d097e984b40fdf11edc84 (patch) | |
| tree | 6724cacb8e05bc9947fee00d5a2dd6c47605ce66 /cmakelists.txt | |
| parent | 73970addd82584a9ec6ad4c95ba5d54dfe0f640c (diff) | |
| parent | 421ae80b0ccbfa33856fe1f079bc3cd6acf44175 (diff) | |
| download | mariadb-git-fa780d44c64df04bb78d097e984b40fdf11edc84.tar.gz | |
Manual merge.
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'cmakelists.txt')
| -rw-r--r-- | cmakelists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmakelists.txt b/cmakelists.txt index 6c6834730b0..5ed5069fb46 100644 --- a/cmakelists.txt +++ b/cmakelists.txt @@ -33,5 +33,5 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visu ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE") SUBDIRS(vio dbug strings regex mysys extra/yassl extra/yassl/taocrypt extra - zlib storage/innobase storage/heap storage/myisam storage/myisammrg - client sql server-tools/instance-manager libmysql tests) + zlib storage/heap storage/myisam storage/myisammrg client + ${se_subdirs} sql server-tools/instance-manager libmysql tests) |