From e6b0545c2649fc9bbd58e9bb076a4707ff6de5e1 Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Tue, 11 Jul 2017 21:30:43 -0700 Subject: [PATCH] remove deleted xlntarrow dependency from xlntpyarrow target and don't compile xlntarrow when ARROW=OFF --- source/CMakeLists.txt | 4 ++++ xlntpyarrow/CMakeLists.txt | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index b74fe850..5a9bc657 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -63,6 +63,10 @@ file(GLOB WORKBOOK_SOURCES ${XLNT_SOURCE_DIR}/workbook/*.cpp) file(GLOB WORKSHEET_HEADERS ${XLNT_INCLUDE_DIR}/xlnt/worksheet/*.hpp) file(GLOB WORKSHEET_SOURCES ${XLNT_SOURCE_DIR}/worksheet/*.cpp) +if(NOT ARROW) + list(REMOVE_ITEM UTILS_SOURCES ${XLNT_SOURCE_DIR}/utils/xlntarrow.cpp) +endif() + file(GLOB DETAIL_ROOT_HEADERS ${XLNT_SOURCE_DIR}/detail/*.hpp) file(GLOB DETAIL_ROOT_SOURCES ${XLNT_SOURCE_DIR}/detail/*.cpp) file(GLOB DETAIL_CRYPTOGRAPHY_HEADERS ${XLNT_SOURCE_DIR}/detail/cryptography/*.hpp) diff --git a/xlntpyarrow/CMakeLists.txt b/xlntpyarrow/CMakeLists.txt index e3fbba1c..1cdcae84 100644 --- a/xlntpyarrow/CMakeLists.txt +++ b/xlntpyarrow/CMakeLists.txt @@ -10,5 +10,4 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/setup.py.cmake" add_custom_target(xlntpyarrow ALL COMMAND python setup.py build - DEPENDS xlntarrow - SOURCES xlntpyarrow.cpp setup.py.cmake) + SOURCES xlntpyarrow.cpp setup.py.cmake)