Merge pull request #3 from tfussell/master

update
2024-03-22 13:11:17 +08:00 · 2017-03-06 19:46:46 +01:00 · 2017-03-06 19:46:46 +01:00 · a6e9907b14
commit a6e9907b14
parent d9f755c67b 9b4ef0db03
11 changed files with 43 additions and 26 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -17,7 +17,7 @@ matrix:
          sources:
            - ubuntu-toolchain-r-test
          packages:
-            - g++-6 zlib1g libcrypto++9 libcrypto++9-dbg libcrypto++-dev
+            - g++-6 zlib1g libcrypto++9 libcrypto++9-dbg libcrypto++-dev cxxtest
      env:
        - COMPILER=g++-6
        - COVERAGE=OFF
@ -30,4 +30,4 @@ script:
  - cd build
  - cmake -D STATIC=$STATIC -D BENCHMARKS=$BENCHMARKS -D SAMPLES=$SAMPLES -D COVERAGE=$COVERAGE -D CMAKE_CXX_COMPILER=$COMPILER -D CMAKE_BUILD_TYPE=Debug ..
  - cmake --build .
-  - cd bin && ./xlnt.test
+  - cd tests && ./xlnt.test
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -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
--- a/benchmarks/CMakeLists.txt
+++ b/benchmarks/CMakeLists.txt
@ -1,19 +1,24 @@
-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)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../source ${CMAKE_CURRENT_BINARY_DIR}/source)
 endif()

 include_directories(${LIBRARY_INCLUDE_DIR})

 file(GLOB SAMPLE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)

+find_package(ZLIB REQUIRED)
+
 foreach(SAMPLE_SOURCE IN ITEMS ${SAMPLE_SOURCES})
    get_filename_component(SAMPLE_NAME ${SAMPLE_SOURCE} NAME_WE)
    set(SAMPLE_EXECUTABLE benchmark-${SAMPLE_NAME})
    add_executable(${SAMPLE_EXECUTABLE} ${SAMPLE_SOURCE})
-    target_link_libraries(${SAMPLE_EXECUTABLE} xlnt)
+    target_link_libraries(${SAMPLE_EXECUTABLE} PRIVATE xlnt PRIVATE ${ZLIB_LIBRARIES})
 endforeach()

 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@ -1,22 +1,22 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.2)
 project(xlnt.samples)

 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)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../source ${CMAKE_CURRENT_BINARY_DIR}/source)
 endif()

-include_directories(${LIBRARY_INCLUDE_DIR})
-
 file(GLOB SAMPLE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)

+find_package(ZLIB REQUIRED)
+
 foreach(SAMPLE_SOURCE IN ITEMS ${SAMPLE_SOURCES})
    get_filename_component(SAMPLE_NAME ${SAMPLE_SOURCE} NAME_WE)
    set(SAMPLE_EXECUTABLE sample-${SAMPLE_NAME})
    add_executable(${SAMPLE_EXECUTABLE} ${SAMPLE_SOURCE})
-    target_link_libraries(${SAMPLE_EXECUTABLE} ${LIBRARY_NAME})
+    target_link_libraries(${SAMPLE_EXECUTABLE} PRIVATE xlnt PRIVATE ${ZLIB_LIBRARIES})
 endforeach()

 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@ -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)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -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)
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.2)
 project(program)

 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}")
--- a/third-party/cryptopp/CMakeLists.txt
+++ b/third-party/cryptopp/CMakeLists.txt
@ -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
--- a/third-party/cxxtest/CMakeLists.txt
+++ b/third-party/cxxtest/CMakeLists.txt
@ -1,6 +1,9 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.2)
 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
--- a/third-party/libstudxml/CMakeLists.txt
+++ b/third-party/libstudxml/CMakeLists.txt
@ -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()
--- a/third-party/zlib/CMakeLists.txt
+++ b/third-party/zlib/CMakeLists.txt
@ -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