Commit c03f0cf2 authored by Sergei Golubchik's avatar Sergei Golubchik

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
parent 9c98876c
...@@ -12,7 +12,7 @@ MACRO (USE_BUNDLED_JEMALLOC) ...@@ -12,7 +12,7 @@ MACRO (USE_BUNDLED_JEMALLOC)
PREFIX extra/jemalloc PREFIX extra/jemalloc
SOURCE_DIR ${SOURCE_DIR} SOURCE_DIR ${SOURCE_DIR}
BINARY_DIR ${BINARY_DIR} BINARY_DIR ${BINARY_DIR}
STAMP_DIR ${SOURCE_DIR} STAMP_DIR ${BINARY_DIR}
CONFIGURE_COMMAND "${SOURCE_DIR}/configure" ${JEMALLOC_CONFIGURE_OPTS} CONFIGURE_COMMAND "${SOURCE_DIR}/configure" ${JEMALLOC_CONFIGURE_OPTS}
BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} "build_lib_static" BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} "build_lib_static"
INSTALL_COMMAND "" INSTALL_COMMAND ""
......
...@@ -151,13 +151,13 @@ MACRO(PROCESS_COLLECTION_INCLUDE collin collection) ...@@ -151,13 +151,13 @@ MACRO(PROCESS_COLLECTION_INCLUDE collin collection)
ENDFOREACH() ENDFOREACH()
ENDMACRO() ENDMACRO()
FILE(GLOB infiles "collections/*.in") #FILE(GLOB infiles "collections/*.in")
FOREACH(collin ${infiles}) #FOREACH(collin ${infiles})
STRING(REPLACE ".in" "" collection ${collin}) # STRING(REPLACE ".in" "" collection ${collin})
STRING(REPLACE ".in" ".done" colldone ${collin}) # STRING(REPLACE ".in" ".done" colldone ${collin})
# Only generate file once # # Only generate file once
IF(NOT EXISTS ${colldone}) # IF(NOT EXISTS ${colldone})
PROCESS_COLLECTION_INCLUDE(${collin} ${collection}) # PROCESS_COLLECTION_INCLUDE(${collin} ${collection})
FILE(APPEND ${colldone} "${collin}\n") # FILE(APPEND ${colldone} "${collin}\n")
ENDIF() # ENDIF()
ENDFOREACH() #ENDFOREACH()
...@@ -61,4 +61,4 @@ install( ...@@ -61,4 +61,4 @@ install(
) )
## build tags ## build tags
include(TokuBuildTagDatabases) #include(TokuBuildTagDatabases)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment