From 11fc6b49d96931d08bb8d266270014c0633a0fa5 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@montyprogram.com>
Date: Mon, 23 Sep 2013 23:33:18 +0200
Subject: [PATCH] MDEV-5053 - fix cyclic dependency when building with Ninja
 CMake generator

---
 cmake/jemalloc.cmake | 9 ++++++++-
 sql/CMakeLists.txt   | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cmake/jemalloc.cmake b/cmake/jemalloc.cmake
index 5cb9c493a20..fc7b2a73e72 100644
--- a/cmake/jemalloc.cmake
+++ b/cmake/jemalloc.cmake
@@ -15,13 +15,20 @@ MACRO (USE_BUNDLED_JEMALLOC)
   IF (CMAKE_BUILD_TYPE MATCHES "Debug" AND NOT APPLE) # see the comment in CMakeLists.txt
     LIST(APPEND JEMALLOC_CONFIGURE_OPTS --enable-debug)
   ENDIF()
+  
+  IF(CMAKE_GENERATOR MATCHES "Makefiles")
+    SET(MAKE_COMMAND ${CMAKE_MAKE_PROGRAM})
+  ELSE() # Xcode/Ninja generators
+    SET(MAKE_COMMAND make)
+  ENDIF()
+  
   ExternalProject_Add(jemalloc
     PREFIX extra/jemalloc
     SOURCE_DIR ${SOURCE_DIR}
     BINARY_DIR ${BINARY_DIR}
     STAMP_DIR  ${BINARY_DIR}
     CONFIGURE_COMMAND "${SOURCE_DIR}/configure" ${JEMALLOC_CONFIGURE_OPTS}
-    BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} "build_lib_static"
+    BUILD_COMMAND  ${MAKE_COMMAND} "build_lib_static"
     INSTALL_COMMAND ""
   )
   ADD_LIBRARY(libjemalloc STATIC IMPORTED)
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 02265196e2d..6483ba01d2a 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -25,7 +25,6 @@ ${CMAKE_BINARY_DIR}/sql
 SET(GEN_SOURCES
 ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.h 
 ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc
-${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc
 ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h 
 )
 
@@ -85,6 +84,7 @@ SET (SQL_SOURCE
                gcalc_slicescan.cc gcalc_tools.cc
 			   threadpool_common.cc 
 			   ../sql-common/mysql_async.c
+               ${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc
                ${GEN_SOURCES}
                ${MYSYS_LIBWRAP_SOURCE}
 			   )