clean up cmake lists

pull/127/head^2
Thomas Fussell 2017-03-05 22:39:27 -05:00
parent 3883d8ae19
commit 0aa26019e2
9 changed files with 31 additions and 16 deletions

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 3.2)
project(xlnt_all)
# This indicates to CMakeLists in subdirectories that they are part of a larger project

View File

@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 3.2)
project(xlnt.benchmarks)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(NOT COMBINED_PROJECT)
add_subdirectory(${LIBRARY_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/source)
endif()

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 3.2)
project(xlnt.samples)
set(CMAKE_CXX_STANDARD 14)

View File

@ -1,22 +1,23 @@
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 3.2)
project(xlnt VERSION 0.9.3)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(PROJECT_VENDOR "Thomas Fussell")
set(PROJECT_CONTACT "thomas.fussell@gmail.com")
set(PROJECT_URL "https://github.com/tfussell/xlnt")
set(PROJECT_DESCRIPTION "cross-platform user-friendly xlsx library for C++14")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../third-party")
find_package(zlib)
find_package(CryptoPP)
find_package(ZLIB REQUIRED)
find_package(CryptoPP REQUIRED)
if(APPLE)
option(FRAMEWORK "Set to ON to package dylib and headers into a .framework, OSX only" OFF)
endif()
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(XLNT_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
set(XLNT_INCLUDE_DIR ${XLNT_ROOT_DIR}/include)

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 3.2)
project(xlnt.test)
set(CMAKE_CXX_STANDARD 14)
@ -8,8 +8,8 @@ if(NOT COMBINED_PROJECT)
add_subdirectory(${LIBRARY_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/source)
endif()
find_package(CxxTest)
find_package(zlib)
find_package(CxxTest REQUIRED)
find_package(ZLIB REQUIRED)
file(GLOB CELL_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/../source/cell/tests/test_*.hpp)
file(GLOB CHARTS_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/../source/charts/tests/test_*.hpp)

View File

@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 3.7)
cmake_minimum_required(VERSION 3.2)
project(cryptopp)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
include(ExternalProject)
ExternalProject_Add(cryptopp-download
GIT_REPOSITORY https://github.com/weidai11/cryptopp

View File

@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 3.7)
project(cxxtest)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
include(ExternalProject)
ExternalProject_Add(cxxtest-download
GIT_REPOSITORY https://github.com/CxxTest/cxxtest

View File

@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 3.2)
project(libstudxml)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(LIBSTUDXML_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(LIBSTUDXML_INCLUDE_DIR ${LIBSTUDXML_ROOT_DIR})
@ -48,9 +51,8 @@ add_library(libstudxml STATIC ${LIBSTUDXML} ${GENX} ${EXPAT})
target_compile_definitions(libstudxml PUBLIC LIBSTUDXML_STATIC_LIB=1)
target_include_directories(libstudxml PUBLIC ${LIBSTUDXML_ROOT_DIR})
find_package(expat)
if(NOT BUILD_DEPS)
find_package(EXPAT REQUIRED)
target_compile_definitions(libstudxml PRIVATE LIBSTUDXML_EXTERNAL_EXPAT=1)
target_link_libraries(libstudxml PRIVATE expat)
endif()

View File

@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 3.7)
cmake_minimum_required(VERSION 3.2)
project(zlib)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
include(ExternalProject)
ExternalProject_Add(zlib-download
GIT_REPOSITORY https://github.com/madler/zlib