Fix Spdlog CI

Author: zeroxs

.travis.yml

@@ -1,11 +1,20 @@
-sudo: false
 language: cpp
+dist: bionic
+os: linux
 
-matrix:
+jobs:
   include:
+    # GCC 10 C++17
+    - compiler: gcc
+      env:
+        - MATRIX_EVAL="COMPILER=g++-10 && CXX=g++-10 && CXX_STANDARD=17"
+      addons:
+        apt:
+          packages: libcrypto++-dev g++-10
+          sources: &sources
+            - ubuntu-toolchain-r-test
     # GCC 7 C++17
-    - os: linux
-      compiler: gcc
+    - compiler: gcc
       env:
         - MATRIX_EVAL="COMPILER=g++-7 && CXX=g++-7 && CXX_STANDARD=17"
       addons:
@@ -14,8 +23,7 @@ matrix:
           sources: &sources
             - ubuntu-toolchain-r-test
     # GCC 5 C++14
-    - os: linux
-      compiler: gcc
+    - compiler: gcc
       env:
         - MATRIX_EVAL="COMPILER=g++-5 && CXX=g++-5 && CXX_STANDARD=14"
       addons:

CMakeLists.txt

@@ -33,7 +33,7 @@ find_package(Threads REQUIRED)
 
 find_package(Asio 1.12.0 REQUIRED MODULE)
 find_package(JSON 3.1.2 REQUIRED MODULE)
-find_package(Spdlog 0.16.4 REQUIRED MODULE)
+find_package(Spdlog 1.6.0 REQUIRED MODULE)
 find_package(Websocketpp 0.7.0 REQUIRED MODULE)
 find_package(OpenSSL 1.0.1 REQUIRED MODULE)
 find_package(ZLIB REQUIRED MODULE)

cmake/AegisConfig.cmake.in

@@ -6,7 +6,7 @@ list(APPEND CMAKE_MODULE_PATH ${Aegis_CMAKE_DIR})
 find_dependency(Threads REQUIRED)
 find_dependency(Asio 1.12.0 REQUIRED MODULE)
 find_dependency(JSON 3.1.2 REQUIRED MODULE)
-find_dependency(Spdlog 0.16.4 REQUIRED MODULE)
+find_dependency(Spdlog 1.6.0 REQUIRED MODULE)
 find_dependency(Websocketpp 0.7.0 REQUIRED MODULE)
 find_dependency(OpenSSL 1.0.2 REQUIRED MODULE)
 find_dependency(ZLIB REQUIRED MODULE)

cmake/FindSpdlog.cmake

@@ -11,13 +11,27 @@ if (Spdlog_INCLUDE_DIR STREQUAL "Spdlog_INCLUDE_DIR-NOTFOUND")
   set(Spdlog_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/spdlog/include)
 endif ()
 
-file(READ ${Spdlog_INCLUDE_DIR}/spdlog/common.h common_h)
-if (NOT common_h MATCHES "SPDLOG_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)-?(.*)\"")
-  message(FATAL_ERROR "Cannot get SPDLOG_VERSION from common.h.")
+
+file(READ ${Spdlog_INCLUDE_DIR}/spdlog/version.h version_h)
+
+if (NOT version_h MATCHES "#define SPDLOG_VER_MAJOR ([0-9]+)")
+  message(FATAL_ERROR "Cannot get Spdlog version from version.h.")
 endif ()
+
 math(EXPR CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_MATCH_1})
-math(EXPR CPACK_PACKAGE_VERSION_MINOR ${CMAKE_MATCH_2})
-math(EXPR CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_3})
+
+if (NOT version_h MATCHES "#define SPDLOG_VER_MINOR ([0-9]+)")
+  message(FATAL_ERROR "Cannot get Spdlog version from version.h.")
+endif ()
+
+math(EXPR CPACK_PACKAGE_VERSION_MINOR ${CMAKE_MATCH_1})
+
+if (NOT version_h MATCHES "#define SPDLOG_VER_PATCH ([0-9]+)")
+  message(FATAL_ERROR "Cannot get Spdlog version from version.h.")
+endif ()
+
+math(EXPR CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_1})
+
 string(CONCAT PC_Spdlog_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.
                  ${CPACK_PACKAGE_VERSION_PATCH})