Commit 20af7d7d authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

refs #4871 some changes that may help the ninja generator


git-svn-id: file:///svn/toku/tokudb@48319 c7de825b-a66e-492c-adef-691d508d4ae1
parent efdfd842
...@@ -21,7 +21,7 @@ endif () ...@@ -21,7 +21,7 @@ endif ()
if (CMAKE_GENERATOR STREQUAL Ninja) if (CMAKE_GENERATOR STREQUAL Ninja)
## ninja doesn't understand "$(MAKE)" ## ninja doesn't understand "$(MAKE)"
ExternalProject_Add(ep_lzma ExternalProject_Add(build_lzma
PREFIX xz PREFIX xz
SOURCE_DIR "${XZ_SOURCE_DIR}" SOURCE_DIR "${XZ_SOURCE_DIR}"
CONFIGURE_COMMAND CONFIGURE_COMMAND
...@@ -35,7 +35,7 @@ if (CMAKE_GENERATOR STREQUAL Ninja) ...@@ -35,7 +35,7 @@ if (CMAKE_GENERATOR STREQUAL Ninja)
else () else ()
## use "$(MAKE)" for submakes so they can use the jobserver, doesn't ## use "$(MAKE)" for submakes so they can use the jobserver, doesn't
## seem to break Xcode... ## seem to break Xcode...
ExternalProject_Add(ep_lzma ExternalProject_Add(build_lzma
PREFIX xz PREFIX xz
SOURCE_DIR "${XZ_SOURCE_DIR}" SOURCE_DIR "${XZ_SOURCE_DIR}"
CONFIGURE_COMMAND CONFIGURE_COMMAND
...@@ -66,29 +66,11 @@ set_source_files_properties( ...@@ -66,29 +66,11 @@ set_source_files_properties(
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/vli.h" "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/vli.h"
PROPERTIES GENERATED TRUE) PROPERTIES GENERATED TRUE)
add_custom_target(build_lzma DEPENDS ep_lzma
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma.h"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/base.h"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/bcj.h"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/block.h"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/check.h"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/container.h"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/delta.h"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/filter.h"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/index.h"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/index_hash.h"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/lzma.h"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/stream_flags.h"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/subblock.h"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/version.h"
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include/lzma/vli.h"
)
include_directories("${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include") include_directories("${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/include")
add_library(lzma STATIC IMPORTED) add_library(lzma STATIC IMPORTED)
set_target_properties(lzma PROPERTIES IMPORTED_LOCATION set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a") "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
add_dependencies(lzma build_lzma)
# TODO(leif): jemalloc? # TODO(leif): jemalloc?
\ No newline at end of file
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