Build update (#11)

* update cmake macros

* remove appveyor

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* remove unused files

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.clang-format

@@ -1,6 +1,6 @@
 ---
 AccessModifierOffset: "-2"
-AlignAfterOpenBracket: AlwaysBreak
+AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: "false"
 AlignConsecutiveDeclarations: "false"
 #AlignConsecutiveMacros: 'true'
@@ -28,7 +28,7 @@ BraceWrapping:
   BeforeCatch: true
 BreakBeforeTernaryOperators: "false"
 BreakConstructorInitializers: AfterColon
-#BreakInheritanceList: AfterColon
+BreakInheritanceList: AfterColon
 BreakStringLiterals: "false"
 ColumnLimit: 80
 CompactNamespaces: "false"
@@ -39,8 +39,9 @@ Cpp11BracedListStyle: "true"
 DerivePointerAlignment: "false"
 DisableFormat: "false"
 FixNamespaceComments: "true"
-#IncludeBlocks: Regroup
+IncludeBlocks: Regroup
 IndentCaseLabels: "true"
+IndentPPDirectives: AfterHash
 IndentWidth: "4"
 IndentWrappedFunctionNames: "true"
 JavaScriptQuotes: Double
@@ -50,8 +51,8 @@ MaxEmptyLinesToKeep: "1"
 NamespaceIndentation: Inner
 ObjCSpaceAfterProperty: "true"
 ObjCSpaceBeforeProtocolList: "true"
-PenaltyBreakBeforeFirstCallParameter: "90"
-PenaltyBreakComment: "100"
+PenaltyBreakBeforeFirstCallParameter: "120"
+PenaltyBreakComment: "300"
 PenaltyBreakFirstLessLess: "30"
 PenaltyBreakString: "1000"
 PenaltyExcessCharacter: "1000000"
@@ -64,10 +65,11 @@ SpaceAfterCStyleCast: "false"
 #SpaceAfterLogicalNot: 'false'
 SpaceAfterTemplateKeyword: "false"
 SpaceBeforeAssignmentOperators: "true"
-#SpaceBeforeCpp11BracedList: 'false'
-#SpaceBeforeCtorInitializerColon: 'false'
+SpaceBeforeCpp11BracedList: "false"
+SpaceBeforeCtorInitializerColon: "false"
+SpaceBeforeInheritanceColon: "false"
 SpaceBeforeParens: ControlStatements
-#SpaceBeforeRangeBasedForLoopColon: 'true'
+SpaceBeforeRangeBasedForLoopColon: "true"
 SpaceInEmptyParentheses: "false"
 SpacesBeforeTrailingComments: "2"
 SpacesInAngles: "false"

.pre-commit-config.yaml

@@ -41,6 +41,10 @@ repos:
       - id: check-symlinks
       - id: check-yaml
       - id: end-of-file-fixer
+      - id: check-shebang-scripts-are-executable
+      - id: check-executables-have-shebangs
+      - id: debug-statements
+      - id: detect-private-key
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v16.0.3
     hooks:

CMakeLists.txt

@@ -7,15 +7,15 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # ~~~
 
-cmake_minimum_required(VERSION 3.11...3.24)
+cmake_minimum_required(VERSION 3.11...3.25)
 
-project(GMLC_CONCURRENCY VERSION 0.3.0)
+project(GMLC_CONCURRENCY VERSION 0.4.0)
 
 # -----------------------------------------------------------------------------
 # GMLC CONCURRENCY library Version number
 # -----------------------------------------------------------------------------
 set(GMLC_CONCURRENCY_VERSION_BUILD)
-set(GMLC_CONCURRENCY_DATE "2023-09-24")
+set(GMLC_CONCURRENCY_DATE "2023-05-11")
 
 set(GMLC_CONCURRENCY_VERSION_STRING
     "${GMLC_CONCURRENCY_VERSION} (${GMLC_CONCURRENCY_DATE})"

config/cmake/AddGooglebenchmark.cmake

@@ -1,5 +1,5 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# Copyright (c) 2017-2022, Battelle Memorial Institute; Lawrence Livermore
+# Copyright (c) 2017-2023, Battelle Memorial Institute; Lawrence Livermore
 # National Security, LLC; Alliance for Sustainable Energy, LLC.
 # See the top-level NOTICE for additional details.
 # All rights reserved.
@@ -15,8 +15,7 @@ if(NOT CMAKE_VERSION VERSION_LESS 3.11)
     include(FetchContent)
 
     fetchcontent_declare(
-        gbenchmark
-        GIT_REPOSITORY https://github.com/google/benchmark.git
+        gbenchmark GIT_REPOSITORY https://github.com/google/benchmark.git
         GIT_TAG ${gbenchmark_version}
     )
 
@@ -52,40 +51,15 @@ else() # cmake <3.11
 
 endif()
 
-set(BENCHMARK_ENABLE_GTEST_TESTS
-    OFF
-    CACHE INTERNAL ""
-)
-set(BENCHMARK_ENABLE_TESTING
-    OFF
-    CACHE INTERNAL "Suppressing benchmark's tests"
-)
-set(BENCHMARK_ENABLE_INSTALL
-    OFF
-    CACHE INTERNAL ""
-)
-set(BENCHMARK_DOWNLOAD_DEPENDENCIES
-    ON
-    CACHE INTERNAL ""
-)
-set(BENCHMARK_ENABLE_ASSEMBLY_TESTS
-    OFF
-    CACHE INTERNAL ""
-)
-# tell google benchmarks to use std regex since we only compile on compilers with std
-# regex
-set(HAVE_STD_REGEX
-    ON
-    CACHE INTERNAL ""
-)
-set(HAVE_POSIX_REGEX
-    OFF
-    CACHE INTERNAL ""
-)
-set(HAVE_GNU_POSIX_REGEX
-    OFF
-    CACHE INTERNAL ""
-)
+set(BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE INTERNAL "")
+set(BENCHMARK_ENABLE_TESTING OFF CACHE INTERNAL "Suppressing benchmark's tests")
+set(BENCHMARK_ENABLE_INSTALL OFF CACHE INTERNAL "")
+set(BENCHMARK_DOWNLOAD_DEPENDENCIES ON CACHE INTERNAL "")
+set(BENCHMARK_ENABLE_ASSEMBLY_TESTS OFF CACHE INTERNAL "")
+# tell google benchmarks to use std regex since we only compile on compilers with std regex
+set(HAVE_STD_REGEX ON CACHE INTERNAL "")
+set(HAVE_POSIX_REGEX OFF CACHE INTERNAL "")
+set(HAVE_GNU_POSIX_REGEX OFF CACHE INTERNAL "")
 add_subdirectory(${${gbName}_SOURCE_DIR} ${${gbName}_BINARY_DIR} EXCLUDE_FROM_ALL)
 
 # Target must already exist
@@ -116,16 +90,10 @@ hide_variable(BENCHMARK_USE_LIBCXX)
 hide_variable(LIBRT)
 
 set_target_properties(benchmark benchmark_main PROPERTIES FOLDER "Extern")
-target_compile_options(
-    benchmark_main PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4244 /wd4800>
-)
+target_compile_options(benchmark_main PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4244 /wd4800>)
 target_compile_options(benchmark PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4244 /wd4800>)
 
-if(MSVC AND MSVC_VERSION GREATER_EQUAL 1900)
-    target_compile_definitions(
-        benchmark PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
-    )
-    target_compile_definitions(
-        benchmark_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
-    )
+if(MSVC)
+    target_compile_definitions(benchmark PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
+    target_compile_definitions(benchmark_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
 endif()