fix linux build

This commit is contained in:
Thomas Fussell 2015-10-26 01:56:17 -04:00
parent 02e2dde4c7
commit 102c41137d
3 changed files with 7 additions and 4 deletions

View File

@ -1,7 +1,8 @@
cmake_minimum_required(VERSION 3.3.2)
cmake_minimum_required(VERSION 3.2.2)
project(xlnt)
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -std=c++1y)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../../../lib)

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.9)
cmake_minimum_required(VERSION 3.2.2)
project(xlnt.test)
include_directories(../../../include)
include_directories(../../../third-party/pugixml/src)

View File

@ -1,11 +1,13 @@
cmake_minimum_required(VERSION 2.8.9)
cmake_minimum_required(VERSION 3.2.2)
project(xlnt)
include_directories(../../../include)
include_directories(../../../source)
include_directories(../../../third-party/miniz)
include_directories(../../../third-party/pugixml/src)
FILE(GLOB SOURCES ../../../source/*.cpp)
FILE(GLOB SOURCES ../../../source/*/*.cpp)
FILE(GLOB DETAIL_SOURCES ../../../source/detail/*.cpp)
add_library(xlnt STATIC ${SOURCES} ${DETAIL_SOURCES} ../../../third-party/pugixml/src/pugixml.cpp ../../../third-party/miniz/miniz.c)