Merge branch 'dev' of github.com:tfussell/xlnt into dev

This commit is contained in:
Thomas Fussell 2017-07-13 18:40:36 -07:00
commit 4367343e15
2 changed files with 4 additions and 2 deletions

View File

@ -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)

View File

@ -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)]
)