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

get rid of underscores in file/directory names, try linking xlnt statically (is this good?)

Browse Source
This commit is contained in:
Thomas Fussell 2017-07-02 11:43:26 -04:00
parent 361078644e
commit c739eda35b
8 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -32,7 +32,7 @@ if(TESTS)
endif()
if(ARROW)
add_subdirectory(contrib/xlnt_arrow)
add_subdirectory(arrow/xlntarrow)
endif()
add_subdirectory(source)

15
arrow/xlntarrow/CMakeLists.txt Normal file
View File

@ -0,0 +1,15 @@
cmake_minimum_required(VERSION 3.2)
project(xlntarrow)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(XLNT_ARROW
${CMAKE_CURRENT_SOURCE_DIR}/xlntarrow.hpp
${CMAKE_CURRENT_SOURCE_DIR}/xlntarrow.cpp)
add_library(xlntarrow STATIC ${XLNT_ARROW})
target_link_libraries(xlntarrow PRIVATE xlnt)
target_include_directories(xlntarrow PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(xlntarrow PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Miniconda3/Library/include)
target_include_directories(xlntarrow PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../include)

2
contrib/xlnt_arrow/xlnt_arrow.cpp → arrow/xlntarrow/xlntarrow.cpp
View File

@ -1,5 +1,5 @@
#include <xlnt/xlnt.hpp>
#include <xlnt_arrow.hpp>
#include <xlntarrow.hpp>
namespace xlnt {
namespace arrow {

0
contrib/xlnt_arrow/xlnt_arrow.hpp → arrow/xlntarrow/xlntarrow.hpp
View File

5
contrib/xlntpyarrow/python_streambuf.hpp → arrow/xlntpyarrow/python_streambuf.hpp
View File

@ -1,5 +1,4 @@
#ifndef BOOST_ADAPTBX_PYTHON_STREAMBUF_H
#define BOOST_ADAPTBX_PYTHON_STREAMBUF_H
#pragma once
#include <boost/python/object.hpp>
#include <boost/python/str.hpp>
@ -473,5 +472,3 @@ struct ostream : private streambuf_capsule, streambuf::ostream
};
}} // boost_adaptbx::python
#endif // GUARD

8
contrib/xlntpyarrow/setup.py → arrow/xlntpyarrow/setup.py
View File

@ -2,18 +2,18 @@ from distutils.core import setup, Extension
setup(name='xlntpyarrow',
include_dirs = [
'C:/Users/Thomas/Development/xlnt/contrib/xlnt_arrow',
'C:/Users/Thomas/Development/xlnt/contrib/xlntpyarrow',
'C:/Users/Thomas/Development/xlnt/arrow/xlntarrow',
'C:/Users/Thomas/Development/xlnt/arrow/xlntpyarrow',
'C:/Users/Thomas/Miniconda3/Library/include'],
ext_modules=[Extension("xlntpyarrow", ["xlntpyarrow.cpp"],
libraries = [
'arrow',
'xlnt_arrow',
'xlntarrow',
'xlnt'
],
library_dirs = [
'C:/Users/Thomas/Miniconda3/Library/lib',
'C:/Users/Thomas/Development/xlnt/build/contrib/xlnt_arrow/Release',
'C:/Users/Thomas/Development/xlnt/build/arrow/xlntarrow/Release',
'C:/Users/Thomas/Development/xlnt/build/source/Release'
])]
)

2
contrib/xlntpyarrow/xlntpyarrow.cpp → arrow/xlntpyarrow/xlntpyarrow.cpp
View File

@ -1,7 +1,7 @@
#include <iostream>
#include <memory>
#include <vector>
#include <xlnt_arrow.hpp>
#include <xlntarrow.hpp>
#include <python_streambuf.hpp>
#include <Python.h>

14
contrib/xlnt_arrow/CMakeLists.txt
View File

@ -1,14 +0,0 @@
cmake_minimum_required(VERSION 3.2)
project(xlnt_arrow)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(XLNT_ARROW
${CMAKE_CURRENT_SOURCE_DIR}/xlnt_arrow.hpp
${CMAKE_CURRENT_SOURCE_DIR}/xlnt_arrow.cpp)
add_library(xlnt_arrow STATIC ${XLNT_ARROW})
target_include_directories(xlnt_arrow PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(xlnt_arrow PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../third-party/arrow/cpp/src)
target_include_directories(xlnt_arrow PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../include)