StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

try to make windows and linux builds both work

Browse Source
This commit is contained in:
Thomas Fussell 2017-07-05 15:04:57 -07:00
parent f97ad6c1bd
commit 22325a2836
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -35,9 +35,9 @@ if(ARROW)
option(ARROW_INCLUDE_PATH "Include path of Apache Arrow" "") option(ARROW_INCLUDE_PATH "Include path of Apache Arrow" "")
option(ARROW_LIBRARY_PATH "Library path of Apache Arrow" "") option(ARROW_LIBRARY_PATH "Library path of Apache Arrow" "")
if(NOT ARROW_INCLUDE_PATH) if(NOT ARROW_INCLUDE_PATH)
message("Missing Apache Arrow include path.") message(FATAL_ERROR "Missing Apache Arrow include path (-D ARROW_INCLUDE_PATH).")
elseif(NOT ARROW_LIBRARY_PATH) elseif(NOT ARROW_LIBRARY_PATH)
message("Missing Apache Arrow library path.") message(FATAL_ERROR "Missing Apache Arrow library path (-D ARROW_LIBRARY_PATH).")
else() else()
add_subdirectory(arrow/xlntarrow) add_subdirectory(arrow/xlntarrow)
add_subdirectory(arrow/xlntpyarrow) add_subdirectory(arrow/xlntpyarrow)

3
arrow/xlntarrow/CMakeLists.txt
View File

@ -11,7 +11,8 @@ set(XLNT_ARROW
add_library(xlntarrow SHARED ${XLNT_ARROW}) add_library(xlntarrow SHARED ${XLNT_ARROW})
target_compile_definitions(xlntarrow PRIVATE XLNT_EXPORT=1) target_compile_definitions(xlntarrow PRIVATE XLNT_EXPORT=1)
target_link_libraries(xlntarrow PRIVATE xlnt) target_link_libraries(xlntarrow PRIVATE xlnt)
target_link_libraries(xlntarrow PRIVATE ${ARROW_LIBRARY_PATH}/arrow.lib) link_directories(${ARROW_LIBRARY_PATH})
target_link_libraries(xlntarrow PRIVATE arrow)
target_include_directories(xlntarrow PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(xlntarrow PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(xlntarrow PRIVATE ${ARROW_INCLUDE_PATH}) target_include_directories(xlntarrow PRIVATE ${ARROW_INCLUDE_PATH})
target_include_directories(xlntarrow PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../include) target_include_directories(xlntarrow PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../include)

4
arrow/xlntpyarrow/CMakeLists.txt
View File

@ -4,5 +4,7 @@ project(xlntpyarrow)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/setup.py.cmake" configure_file("${CMAKE_CURRENT_SOURCE_DIR}/setup.py.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/setup.py") "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
add_custom_target(xlntpyarrow
add_custom_command(xlntpyarrow
COMMAND python ${CMAKE_CURRENT_BINARY_DIR}/setup.py build_ext) COMMAND python ${CMAKE_CURRENT_BINARY_DIR}/setup.py build_ext)

1
include/xlnt/xlnt.hpp
View File

@ -66,6 +66,7 @@
#include <xlnt/workbook/metadata_property.hpp> #include <xlnt/workbook/metadata_property.hpp>
#include <xlnt/workbook/named_range.hpp> #include <xlnt/workbook/named_range.hpp>
#include <xlnt/workbook/streaming_workbook_reader.hpp> #include <xlnt/workbook/streaming_workbook_reader.hpp>
#include <xlnt/workbook/streaming_workbook_writer.hpp>
#include <xlnt/workbook/theme.hpp> #include <xlnt/workbook/theme.hpp>
#include <xlnt/workbook/workbook.hpp> #include <xlnt/workbook/workbook.hpp>
#include <xlnt/workbook/worksheet_iterator.hpp> #include <xlnt/workbook/worksheet_iterator.hpp>