From c00a7a7798bfa4e3dcafcd38a1aacc64eb828e05 Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Fri, 14 Jul 2017 01:26:49 +0000 Subject: [PATCH] put dll in the correct directory depending on system --- source/CMakeLists.txt | 2 +- xlntpyarrow/setup.py.cmake | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index c1aa6ce9..7985edc1 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.2) -project(xlnt VERSION 0.9.5) +project(xlnt VERSION 0.9) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/xlntpyarrow/setup.py.cmake b/xlntpyarrow/setup.py.cmake index 6f0b30a4..a53b9542 100644 --- a/xlntpyarrow/setup.py.cmake +++ b/xlntpyarrow/setup.py.cmake @@ -22,9 +22,11 @@ include_dirs = [ ] subdirectory = '' +library_dir = 'lib' if os.name == 'nt': subdirectory = '/Release' + library_dir = 'Lib/site-packages' library_dirs = [ os.path.join(project_root, 'build/source' + subdirectory), @@ -83,5 +85,5 @@ setup( author = 'Thomas Fussell', author_email = 'thomas.fussell@gmail.com', url = 'https://github.com/tfussell/xlnt', - data_files = [('Lib/site-packages', data_files)] + data_files = [(library_dir, data_files)] )