From c03f0cf28c039414281547328a369a10728f2500 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Mon, 9 Sep 2013 14:00:40 +0200
Subject: [PATCH] fixes for out-of-source builds

mysql-test/CMakeLists.txt:
  don't generate collection fules. we don't use them
  and they break out-of-source builds
---
 cmake/jemalloc.cmake                   |  2 +-
 mysql-test/CMakeLists.txt              | 20 ++++++++++----------
 storage/tokudb/ft-index/CMakeLists.txt |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cmake/jemalloc.cmake b/cmake/jemalloc.cmake
index b890e155ed6..f39d9e17670 100644
--- a/cmake/jemalloc.cmake
+++ b/cmake/jemalloc.cmake
@@ -12,7 +12,7 @@ MACRO (USE_BUNDLED_JEMALLOC)
     PREFIX extra/jemalloc
     SOURCE_DIR ${SOURCE_DIR}
     BINARY_DIR ${BINARY_DIR}
-    STAMP_DIR  ${SOURCE_DIR}
+    STAMP_DIR  ${BINARY_DIR}
     CONFIGURE_COMMAND "${SOURCE_DIR}/configure" ${JEMALLOC_CONFIGURE_OPTS}
     BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} "build_lib_static"
     INSTALL_COMMAND ""
diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt
index c0ee12fbd23..5ffbd78316c 100644
--- a/mysql-test/CMakeLists.txt
+++ b/mysql-test/CMakeLists.txt
@@ -151,13 +151,13 @@ MACRO(PROCESS_COLLECTION_INCLUDE collin collection)
   ENDFOREACH()
 ENDMACRO()
 
-FILE(GLOB infiles "collections/*.in")
-FOREACH(collin ${infiles})
-  STRING(REPLACE ".in" "" collection ${collin})
-  STRING(REPLACE ".in" ".done" colldone ${collin})
-  # Only generate file once
-  IF(NOT EXISTS ${colldone})
-    PROCESS_COLLECTION_INCLUDE(${collin} ${collection})
-    FILE(APPEND ${colldone} "${collin}\n")
-  ENDIF()
-ENDFOREACH()
+#FILE(GLOB infiles "collections/*.in")
+#FOREACH(collin ${infiles})
+#  STRING(REPLACE ".in" "" collection ${collin})
+#  STRING(REPLACE ".in" ".done" colldone ${collin})
+#  # Only generate file once
+#  IF(NOT EXISTS ${colldone})
+#    PROCESS_COLLECTION_INCLUDE(${collin} ${collection})
+#    FILE(APPEND ${colldone} "${collin}\n")
+#  ENDIF()
+#ENDFOREACH()
diff --git a/storage/tokudb/ft-index/CMakeLists.txt b/storage/tokudb/ft-index/CMakeLists.txt
index dfab216aceb..cb6a82113ca 100644
--- a/storage/tokudb/ft-index/CMakeLists.txt
+++ b/storage/tokudb/ft-index/CMakeLists.txt
@@ -61,4 +61,4 @@ install(
   )
 
 ## build tags
-include(TokuBuildTagDatabases)
+#include(TokuBuildTagDatabases)