From c739eda35b6732da1cc187db404c9461594a6ef5 Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Sun, 2 Jul 2017 11:43:26 -0400 Subject: [PATCH] get rid of underscores in file/directory names, try linking xlnt statically (is this good?) --- CMakeLists.txt | 2 +- arrow/xlntarrow/CMakeLists.txt | 15 +++++++++++++++ .../xlntarrow/xlntarrow.cpp | 2 +- .../xlntarrow/xlntarrow.hpp | 0 .../xlntpyarrow/python_streambuf.hpp | 5 +---- {contrib => arrow}/xlntpyarrow/setup.py | 8 ++++---- {contrib => arrow}/xlntpyarrow/xlntpyarrow.cpp | 2 +- contrib/xlnt_arrow/CMakeLists.txt | 14 -------------- 8 files changed, 23 insertions(+), 25 deletions(-) create mode 100644 arrow/xlntarrow/CMakeLists.txt rename contrib/xlnt_arrow/xlnt_arrow.cpp => arrow/xlntarrow/xlntarrow.cpp (96%) rename contrib/xlnt_arrow/xlnt_arrow.hpp => arrow/xlntarrow/xlntarrow.hpp (100%) rename {contrib => arrow}/xlntpyarrow/python_streambuf.hpp (99%) rename {contrib => arrow}/xlntpyarrow/setup.py (65%) rename {contrib => arrow}/xlntpyarrow/xlntpyarrow.cpp (99%) delete mode 100644 contrib/xlnt_arrow/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index bc50c389..e0582aa0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ if(TESTS) endif() if(ARROW) - add_subdirectory(contrib/xlnt_arrow) + add_subdirectory(arrow/xlntarrow) endif() add_subdirectory(source) diff --git a/arrow/xlntarrow/CMakeLists.txt b/arrow/xlntarrow/CMakeLists.txt new file mode 100644 index 00000000..3de7ebd6 --- /dev/null +++ b/arrow/xlntarrow/CMakeLists.txt @@ -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) diff --git a/contrib/xlnt_arrow/xlnt_arrow.cpp b/arrow/xlntarrow/xlntarrow.cpp similarity index 96% rename from contrib/xlnt_arrow/xlnt_arrow.cpp rename to arrow/xlntarrow/xlntarrow.cpp index aef5c8e0..917a4a06 100644 --- a/contrib/xlnt_arrow/xlnt_arrow.cpp +++ b/arrow/xlntarrow/xlntarrow.cpp @@ -1,5 +1,5 @@ #include -#include +#include namespace xlnt { namespace arrow { diff --git a/contrib/xlnt_arrow/xlnt_arrow.hpp b/arrow/xlntarrow/xlntarrow.hpp similarity index 100% rename from contrib/xlnt_arrow/xlnt_arrow.hpp rename to arrow/xlntarrow/xlntarrow.hpp diff --git a/contrib/xlntpyarrow/python_streambuf.hpp b/arrow/xlntpyarrow/python_streambuf.hpp similarity index 99% rename from contrib/xlntpyarrow/python_streambuf.hpp rename to arrow/xlntpyarrow/python_streambuf.hpp index 73816a5a..f24a85ff 100644 --- a/contrib/xlntpyarrow/python_streambuf.hpp +++ b/arrow/xlntpyarrow/python_streambuf.hpp @@ -1,5 +1,4 @@ -#ifndef BOOST_ADAPTBX_PYTHON_STREAMBUF_H -#define BOOST_ADAPTBX_PYTHON_STREAMBUF_H +#pragma once #include #include @@ -473,5 +472,3 @@ struct ostream : private streambuf_capsule, streambuf::ostream }; }} // boost_adaptbx::python - -#endif // GUARD diff --git a/contrib/xlntpyarrow/setup.py b/arrow/xlntpyarrow/setup.py similarity index 65% rename from contrib/xlntpyarrow/setup.py rename to arrow/xlntpyarrow/setup.py index 749fdd0a..529c9c72 100644 --- a/contrib/xlntpyarrow/setup.py +++ b/arrow/xlntpyarrow/setup.py @@ -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' ])] ) diff --git a/contrib/xlntpyarrow/xlntpyarrow.cpp b/arrow/xlntpyarrow/xlntpyarrow.cpp similarity index 99% rename from contrib/xlntpyarrow/xlntpyarrow.cpp rename to arrow/xlntpyarrow/xlntpyarrow.cpp index 1b1bd210..589afac0 100644 --- a/contrib/xlntpyarrow/xlntpyarrow.cpp +++ b/arrow/xlntpyarrow/xlntpyarrow.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include diff --git a/contrib/xlnt_arrow/CMakeLists.txt b/contrib/xlnt_arrow/CMakeLists.txt deleted file mode 100644 index 13148317..00000000 --- a/contrib/xlnt_arrow/CMakeLists.txt +++ /dev/null @@ -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)