Merge branch 'release/v2.8.3'

Author: DigitalInBlue

CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 # Top level makefile for Celero
 #
-# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
+# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022  John Farrier
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ macro(CeleroSetDefaultCompilerOptions)
 	set_target_properties(${PROJECT_NAME} PROPERTIES
 		POSITION_INDEPENDENT_CODE "${CELERO_COMPILE_PIC}"
 	)
-	if(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
+	if(MSVC)
 		target_compile_options(${PROJECT_NAME} PRIVATE /D_VARIADIC_MAX=10 )
 		target_compile_options(${PROJECT_NAME} PRIVATE /D_CRT_SECURE_NO_WARNINGS)
 		target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
@@ -51,10 +51,10 @@ macro(CeleroSetDefaultCompilerOptions)
             target_compile_options(${PROJECT_NAME} PRIVATE /WX)
 		endif()
 
-	elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
+	elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 		target_compile_options(${PROJECT_NAME} PRIVATE -Wall)
 
-	elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
+	elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 		if(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
 			target_compile_options(${PROJECT_NAME} PRIVATE -Xclang)
 			target_compile_options(${PROJECT_NAME} PRIVATE -Wno-c++98-compat)
@@ -70,7 +70,7 @@ macro(CeleroSetDefaultCompilerOptions)
 			endif()
 		endif()
 
-	elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL AppleClang)
+	elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
 		target_compile_options(${PROJECT_NAME} PRIVATE -Wall)
 
 		if(CELERO_TREAT_WARNINGS_AS_ERRORS)
@@ -80,11 +80,14 @@ macro(CeleroSetDefaultCompilerOptions)
 endmacro()
 
 # Project Name
-PROJECT(CeleroProject)
+PROJECT(celero)
 
 include(CheckFunctionExists)
 include(CheckCXXSourceCompiles)
 include(CheckIncludeFile)
+include(CMakePackageConfigHelpers)
+include(GNUInstallDirs)
+include(CMakeFindDependencyMacro)
 
 #
 # User Options
@@ -103,6 +106,10 @@ else()
 	SET(CELERO_USER_DEFINED_SHARED_OR_STATIC "STATIC")
 endif()
 
+if(CELERO_ENABLE_TESTS)
+	find_dependency(GTest REQUIRED)
+endif()
+
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 #
@@ -122,8 +129,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 # ---------------------------------------------------------------------------
 # ---------------------------------------------------------------------------
 
-set(PROJECT_NAME celero)
-
 if(CELERO_COMPILE_DYNAMIC_LIBRARIES)
 	add_definitions(-DCELERO_EXPORTS)
 else()
@@ -203,30 +208,39 @@ target_link_libraries(${PROJECT_NAME} ${SYSLIBS})
 
 target_include_directories(${PROJECT_NAME} PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
 # ---------------------------------------------------------------------------
 # Install and exports
 # ---------------------------------------------------------------------------
 
-install(TARGETS ${PROJECT_NAME}
-  EXPORT ${PROJECT_NAME}-target
-  RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+install(
+	DIRECTORY   include/
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
-
-install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
-
-# export to be used from install location
-install(EXPORT ${PROJECT_NAME}-target
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/share
+install(
+	TARGETS     celero
+	DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	EXPORT      celero-targets
 )
-
-# export to be used from build directory
-export(EXPORT ${PROJECT_NAME}-target
-  FILE ${PROJECT_NAME}-target.cmake
+install(
+	EXPORT      celero-targets
+	FILE        celero-targets.cmake
+	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/celero
+)
+export(
+	EXPORT 		celero-targets
+    FILE   		celero-targets.cmake
+)
+configure_package_config_file(
+	${CMAKE_CURRENT_SOURCE_DIR}/config.cmake.in
+	${CMAKE_CURRENT_BINARY_DIR}/celero-config.cmake
+	INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/celero
+)
+install(
+	FILES 		${CMAKE_CURRENT_BINARY_DIR}/celero-config.cmake
+	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/celero
 )
 
 if(CELERO_ENABLE_FOLDERS)

README.md

@@ -2,7 +2,7 @@
 
 ### C++ Benchmarking Library
 
-Copyright 2017-2021 John Farrier 
+Copyright 2017-2022 John Farrier 
 
 Apache 2.0 License
 
@@ -25,20 +25,22 @@ A Special Thanks to the following corporations for their support:
 
 Celero has been successfully built on the following platforms during development.  See [Travis.CI](https://travis-ci.org/DigitalInBlue/Celero) for more details.
 
--   GCC v6.0.0
--   GCC v7.0.0
--   GCC v8.0.0
--   GCC v9.0.0
--   LLVM v3.9.0
--   LLVM v5.0.1
--   LLVM v7.0.0
--   LLVM v8.0.0
--   LLVM v9.0.0
--   Visual Studio 2019 (16.8.4)
--   XCode v10.1
--   XCode v10.3
--   XCode v11.0
--   XCode v12.0
+- GCC v6.0.0
+- GCC v7.0.0
+- GCC v8.0.0
+- GCC v9.0.0
+- LLVM v3.9.0
+- LLVM v5.0.1
+- LLVM v7.0.0
+- LLVM v8.0.0
+- LLVM v9.0.0
+- Visual Studio 2019 (16.8.4)
+- Visual Studio 2019 (16.11.5)
+- Visual Studio 2022 (17.0.5)
+- XCode v10.1
+- XCode v10.3
+- XCode v11.0
+- XCode v12.0
 
 As of v2.7, Celero requres the developer to provide GoogleTest in order to build unit tests.  We suggest using a package manager such as VCPKG or Conan to provide the latest version of the library.
 
@@ -339,7 +341,7 @@ BASELINE_FIXED_F(DemoTransform, FixedTime, DemoTransformFixture, 1, 100)
 { /* Nothing to do */ }
 ```
 
-It is important that if your measurements use a test fixture, that your baseline (even if fixed) should use a test fixture as well.  Features such as User-Defined Measurements (UDMs) look to the baseline class to detect if other features are present.  If the baseline does not use a test fixuture, Celero will not know that other classes do use a test fixture that offers a UDM.
+It is important that if your measurements use a test fixture, that your baseline (even if fixed) should use a test fixture as well.  Features such as User-Defined Measurements (UDMs) look to the baseline class to detect if other features are present.  If the baseline does not use a test fixture, Celero will not know that other classes do use a test fixture that offers a UDM.
 
 ### User-Defined Measurements (UDM)
 
@@ -705,7 +707,7 @@ SortRandInts,stdSort,2048,2000,2,0,0.0135828,49,20408.2,98,104.369,282,180.859,1
 SortRandInts,stdSort,4096,2000,2,0,0.00636808,105.5,9478.67,211,221.056,468,392.122,19.8021,6.47829,52.0453,0.507826,1159168,1.15917e+06,1159168,0,0,-nan(ind),0,0,
 ```
 
-Note that in this data, there are `T` statistics and there are `R` stastics.  `T` represents _Time_ and `R` represents _RAM_.
+Note that in this data, there are `T` statistics and there are `R` statistics.  `T` represents _Time_ and `R` represents _RAM_.
 
 The point here is not that `std::sort` is better than more elementary sorting methods, but how easily measurable results can be obtained. In making such measurements more accessible and easier to code, they can become part of the way we code just as automated testing has become.
 

cmake/FindCelero.cmake

@@ -0,0 +1,3 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/celero-targets.cmake")

config.cmake.in

@@ -1,7 +1,7 @@
 #
 # Standard Celero Experiment CMake File
 #
-# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
+# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022  John Farrier
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ target_sources(${PROJECT_NAME} PRIVATE
 )
 
 CeleroSetDefaultCompilerOptions()
-add_dependencies(${PROJECT_NAME} celero)
 target_link_libraries(${PROJECT_NAME} celero)
 include_directories(${HEADER_PATH})
 

experiments/DemoFileWrite/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 # Standard Celero Experiment CMake File
 #
-# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
+# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022  John Farrier
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,7 +41,6 @@ SET(PROJECT_NAME CeleroDemo-Multithread)
     )
 
     # Broiler Plate: Celero Project Dependencies
-    add_dependencies(${PROJECT_NAME} celero)
     target_link_libraries(${PROJECT_NAME} celero)
 
     CeleroSetDefaultCompilerOptions()

experiments/DemoMultithread/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 # Standard Celero Experiment CMake File
 #
-# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier 
+# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022  John Farrier 
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@ add_executable(${PROJECT_NAME}
 )
 
 # Broiler Plate: Celero Project Dependencies
-add_dependencies(${PROJECT_NAME} celero)
 target_link_libraries(${PROJECT_NAME} celero)
 
 CeleroSetDefaultCompilerOptions()

experiments/DemoSimple/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 # Standard Celero Experiment CMake File
 #
-# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier 
+# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022  John Farrier 
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,7 +41,6 @@ add_executable(${PROJECT_NAME}
 )
 
 # Broiler Plate: Celero Project Dependencies
-add_dependencies(${PROJECT_NAME} celero)
 target_link_libraries(${PROJECT_NAME} celero)
 
 CeleroSetDefaultCompilerOptions()

experiments/DemoSimpleJUnit/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 # Standard Celero Experiment CMake File
 #
-# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier 
+# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022  John Farrier 
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@ add_executable(${PROJECT_NAME}
 )
 
 # Broiler Plate: Celero Project Dependencies
-add_dependencies(${PROJECT_NAME} celero)
 target_link_libraries(${PROJECT_NAME} celero)
 
 CeleroSetDefaultCompilerOptions()

experiments/DemoSleep/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 # Standard Celero Experiment CMake File
 #
-# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier 
+# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022  John Farrier 
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,7 +41,6 @@ add_executable(${PROJECT_NAME}
 )
 
 # Broiler Plate: Celero Project Dependencies
-add_dependencies(${PROJECT_NAME} celero)
 target_link_libraries(${PROJECT_NAME} celero)
 
 CeleroSetDefaultCompilerOptions()

experiments/DemoToString/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 # Standard Celero Experiment CMake File
 #
-# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier 
+# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022  John Farrier 
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@ add_executable(${PROJECT_NAME}
 )
 
 # Broiler Plate: Celero Project Dependencies
-add_dependencies(${PROJECT_NAME} celero)
 target_link_libraries(${PROJECT_NAME} celero)
 
 CeleroSetDefaultCompilerOptions()

experiments/DemoTransform/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 # Standard Celero Experiment CMake File
 #
-# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier 
+# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022  John Farrier 
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,7 +43,6 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
     )
 
     # Broiler Plate: Celero Project Dependencies
-    add_dependencies(${PROJECT_NAME} celero)
     target_link_libraries(${PROJECT_NAME} celero)
 
     CeleroSetDefaultCompilerOptions()