Merge bk-internal:/home/bk/mysql-5.1

into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1

Merge bk-internal:/home/bk/mysql-5.1
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
86b4ca84 · unknown · c8e15b21 · c690c11f · 86b4ca84
Commit 86b4ca84 authored Sep 18, 2006 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

CMakeLists.txt CMakeLists.txt +4 -2

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,5 +146,7 @@ ADD_SUBDIRECTORY(sql)
 ADD_SUBDIRECTORY(server-tools/instance-manager)
 ADD_SUBDIRECTORY(libmysql)
 ADD_SUBDIRECTORY(tests)
-ADD_SUBDIRECTORY(libmysqld)
-ADD_SUBDIRECTORY(libmysqld/examples)
+
+# disable libmysqld until it's fixed, so we can use Cmake 2.2 and 2.4
+#ADD_SUBDIRECTORY(libmysqld)
+#ADD_SUBDIRECTORY(libmysqld/examples)