From 0aa26019e2bac999c58b64443a87d26df5e9627e Mon Sep 17 00:00:00 2001
From: Thomas Fussell <thomas.fussell@gmail.com>
Date: Sun, 5 Mar 2017 22:39:27 -0500
Subject: [PATCH] clean up cmake lists

---
 CMakeLists.txt                        |  2 +-
 benchmarks/CMakeLists.txt             |  5 ++++-
 samples/CMakeLists.txt                |  2 +-
 source/CMakeLists.txt                 | 13 +++++++------
 tests/CMakeLists.txt                  |  6 +++---
 third-party/cryptopp/CMakeLists.txt   |  5 ++++-
 third-party/cxxtest/CMakeLists.txt    |  3 +++
 third-party/libstudxml/CMakeLists.txt |  6 ++++--
 third-party/zlib/CMakeLists.txt       |  5 ++++-
 9 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87659fbd..508a4462 100644
--- 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
diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
index 922f3e42..1fd479a4 100644
--- a/benchmarks/CMakeLists.txt
+++ b/benchmarks/CMakeLists.txt
@@ -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()
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 06b887fd..f9f7cfd5 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.2)
 project(xlnt.samples)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index a4ae1f4c..450d35b1 100644
--- 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)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ae22f5cc..9841ba0e 100644
--- 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)
diff --git a/third-party/cryptopp/CMakeLists.txt b/third-party/cryptopp/CMakeLists.txt
index 574db67e..56ce025e 100644
--- 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
diff --git a/third-party/cxxtest/CMakeLists.txt b/third-party/cxxtest/CMakeLists.txt
index 9e4c2476..945818a7 100644
--- a/third-party/cxxtest/CMakeLists.txt
+++ b/third-party/cxxtest/CMakeLists.txt
@@ -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
diff --git a/third-party/libstudxml/CMakeLists.txt b/third-party/libstudxml/CMakeLists.txt
index dec3f2ac..857c3241 100644
--- 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()
diff --git a/third-party/zlib/CMakeLists.txt b/third-party/zlib/CMakeLists.txt
index 4c8167e1..a009c9e1 100644
--- 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