Merge pull request #1422 from mr-c/post_installation_testing

Enable running the tests against an installed copy of spdlog

CMakeLists.txt

@@ -6,12 +6,16 @@ cmake_minimum_required(VERSION 3.2)
 #---------------------------------------------------------------------------------------
 # Start spdlog project
 #---------------------------------------------------------------------------------------
-include(GNUInstallDirs)
 include(cmake/utils.cmake)
 include(cmake/ide.cmake)
 
 spdlog_extract_version()
 
+project(spdlog VERSION ${SPDLOG_VERSION} LANGUAGES CXX)
+message(STATUS "Build spdlog: ${SPDLOG_VERSION}")
+
+include(GNUInstallDirs)
+
 #---------------------------------------------------------------------------------------
 # Set default build to release
 #---------------------------------------------------------------------------------------
@@ -19,8 +23,6 @@ if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose Release or Debug" FORCE)
 endif()
 
-project(spdlog VERSION ${SPDLOG_VERSION} LANGUAGES CXX)
-message(STATUS "Build spdlog: ${SPDLOG_VERSION}")
 
 #---------------------------------------------------------------------------------------
 # Compiler config

example/CMakeLists.txt

@@ -4,6 +4,8 @@
 cmake_minimum_required(VERSION 3.1)
 project(spdlog_examples CXX)
 
+include(../cmake/utils.cmake)
+
 if(NOT TARGET spdlog)
     # Stand-alone build
     find_package(spdlog REQUIRED)

tests/CMakeLists.txt

@@ -1,5 +1,12 @@
+cmake_minimum_required(VERSION 3.2)
+
 project(spdlog_utests CXX)
 
+if(NOT TARGET spdlog)
+    # Stand-alone build
+    find_package(spdlog REQUIRED)
+endif()
+
 include(../cmake/utils.cmake)
 
 find_package(PkgConfig)
@@ -47,6 +54,7 @@ function(spdlog_prepare_test test_target spdlog_lib)
 		spdlog_enable_sanitizer(${test_target})
 	endif()
     add_test(NAME ${test_target} COMMAND ${test_target})
+    set_tests_properties(${test_target} PROPERTIES RUN_SERIAL ON)
 endfunction()
 
 # The compiled library tests

tests/utils.h

@@ -3,8 +3,6 @@
 #include <cstddef>
 #include <string>
 
-std::size_t count_lines(const std::string &filename);
-
 std::size_t count_files(const std::string &folder);
 
 void prepare_logdir();