Skip to content

Commit 3a06173

Browse files
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>
1 parent df3d8ee commit 3a06173

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+447
-619
lines changed

.appveyor.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.ci/build_docs.sh

Lines changed: 0 additions & 106 deletions
This file was deleted.

.ci/build_doxygen.sh

Lines changed: 0 additions & 24 deletions
This file was deleted.

.ci/build_lcov.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

.ci/check_tidy.sh

Lines changed: 0 additions & 21 deletions
This file was deleted.

.ci/tsan-cache.cmake

Lines changed: 0 additions & 16 deletions
This file was deleted.

.clang-format

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
AccessModifierOffset: "-2"
3-
AlignAfterOpenBracket: AlwaysBreak
3+
AlignAfterOpenBracket: Align
44
AlignConsecutiveAssignments: "false"
55
AlignConsecutiveDeclarations: "false"
66
#AlignConsecutiveMacros: 'true'
@@ -28,7 +28,7 @@ BraceWrapping:
2828
BeforeCatch: true
2929
BreakBeforeTernaryOperators: "false"
3030
BreakConstructorInitializers: AfterColon
31-
#BreakInheritanceList: AfterColon
31+
BreakInheritanceList: AfterColon
3232
BreakStringLiterals: "false"
3333
ColumnLimit: 80
3434
CompactNamespaces: "false"
@@ -39,8 +39,9 @@ Cpp11BracedListStyle: "true"
3939
DerivePointerAlignment: "false"
4040
DisableFormat: "false"
4141
FixNamespaceComments: "true"
42-
#IncludeBlocks: Regroup
42+
IncludeBlocks: Regroup
4343
IndentCaseLabels: "true"
44+
IndentPPDirectives: AfterHash
4445
IndentWidth: "4"
4546
IndentWrappedFunctionNames: "true"
4647
JavaScriptQuotes: Double
@@ -50,8 +51,8 @@ MaxEmptyLinesToKeep: "1"
5051
NamespaceIndentation: Inner
5152
ObjCSpaceAfterProperty: "true"
5253
ObjCSpaceBeforeProtocolList: "true"
53-
PenaltyBreakBeforeFirstCallParameter: "90"
54-
PenaltyBreakComment: "100"
54+
PenaltyBreakBeforeFirstCallParameter: "120"
55+
PenaltyBreakComment: "300"
5556
PenaltyBreakFirstLessLess: "30"
5657
PenaltyBreakString: "1000"
5758
PenaltyExcessCharacter: "1000000"
@@ -64,10 +65,11 @@ SpaceAfterCStyleCast: "false"
6465
#SpaceAfterLogicalNot: 'false'
6566
SpaceAfterTemplateKeyword: "false"
6667
SpaceBeforeAssignmentOperators: "true"
67-
#SpaceBeforeCpp11BracedList: 'false'
68-
#SpaceBeforeCtorInitializerColon: 'false'
68+
SpaceBeforeCpp11BracedList: "false"
69+
SpaceBeforeCtorInitializerColon: "false"
70+
SpaceBeforeInheritanceColon: "false"
6971
SpaceBeforeParens: ControlStatements
70-
#SpaceBeforeRangeBasedForLoopColon: 'true'
72+
SpaceBeforeRangeBasedForLoopColon: "true"
7173
SpaceInEmptyParentheses: "false"
7274
SpacesBeforeTrailingComments: "2"
7375
SpacesInAngles: "false"

.pre-commit-config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ repos:
4141
- id: check-symlinks
4242
- id: check-yaml
4343
- id: end-of-file-fixer
44+
- id: check-shebang-scripts-are-executable
45+
- id: check-executables-have-shebangs
46+
- id: debug-statements
47+
- id: detect-private-key
4448
- repo: https://github.com/pre-commit/mirrors-clang-format
4549
rev: v16.0.3
4650
hooks:

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
# SPDX-License-Identifier: BSD-3-Clause
88
# ~~~
99

10-
cmake_minimum_required(VERSION 3.11...3.24)
10+
cmake_minimum_required(VERSION 3.11...3.25)
1111

12-
project(GMLC_CONCURRENCY VERSION 0.3.0)
12+
project(GMLC_CONCURRENCY VERSION 0.4.0)
1313

1414
# -----------------------------------------------------------------------------
1515
# GMLC CONCURRENCY library Version number
1616
# -----------------------------------------------------------------------------
1717
set(GMLC_CONCURRENCY_VERSION_BUILD)
18-
set(GMLC_CONCURRENCY_DATE "2023-09-24")
18+
set(GMLC_CONCURRENCY_DATE "2023-05-11")
1919

2020
set(GMLC_CONCURRENCY_VERSION_STRING
2121
"${GMLC_CONCURRENCY_VERSION} (${GMLC_CONCURRENCY_DATE})"

config/cmake/AddGooglebenchmark.cmake

Lines changed: 15 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2-
# Copyright (c) 2017-2022, Battelle Memorial Institute; Lawrence Livermore
2+
# Copyright (c) 2017-2023, Battelle Memorial Institute; Lawrence Livermore
33
# National Security, LLC; Alliance for Sustainable Energy, LLC.
44
# See the top-level NOTICE for additional details.
55
# All rights reserved.
@@ -15,8 +15,7 @@ if(NOT CMAKE_VERSION VERSION_LESS 3.11)
1515
include(FetchContent)
1616

1717
fetchcontent_declare(
18-
gbenchmark
19-
GIT_REPOSITORY https://github.com/google/benchmark.git
18+
gbenchmark GIT_REPOSITORY https://github.com/google/benchmark.git
2019
GIT_TAG ${gbenchmark_version}
2120
)
2221

@@ -52,40 +51,15 @@ else() # cmake <3.11
5251

5352
endif()
5453

55-
set(BENCHMARK_ENABLE_GTEST_TESTS
56-
OFF
57-
CACHE INTERNAL ""
58-
)
59-
set(BENCHMARK_ENABLE_TESTING
60-
OFF
61-
CACHE INTERNAL "Suppressing benchmark's tests"
62-
)
63-
set(BENCHMARK_ENABLE_INSTALL
64-
OFF
65-
CACHE INTERNAL ""
66-
)
67-
set(BENCHMARK_DOWNLOAD_DEPENDENCIES
68-
ON
69-
CACHE INTERNAL ""
70-
)
71-
set(BENCHMARK_ENABLE_ASSEMBLY_TESTS
72-
OFF
73-
CACHE INTERNAL ""
74-
)
75-
# tell google benchmarks to use std regex since we only compile on compilers with std
76-
# regex
77-
set(HAVE_STD_REGEX
78-
ON
79-
CACHE INTERNAL ""
80-
)
81-
set(HAVE_POSIX_REGEX
82-
OFF
83-
CACHE INTERNAL ""
84-
)
85-
set(HAVE_GNU_POSIX_REGEX
86-
OFF
87-
CACHE INTERNAL ""
88-
)
54+
set(BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE INTERNAL "")
55+
set(BENCHMARK_ENABLE_TESTING OFF CACHE INTERNAL "Suppressing benchmark's tests")
56+
set(BENCHMARK_ENABLE_INSTALL OFF CACHE INTERNAL "")
57+
set(BENCHMARK_DOWNLOAD_DEPENDENCIES ON CACHE INTERNAL "")
58+
set(BENCHMARK_ENABLE_ASSEMBLY_TESTS OFF CACHE INTERNAL "")
59+
# tell google benchmarks to use std regex since we only compile on compilers with std regex
60+
set(HAVE_STD_REGEX ON CACHE INTERNAL "")
61+
set(HAVE_POSIX_REGEX OFF CACHE INTERNAL "")
62+
set(HAVE_GNU_POSIX_REGEX OFF CACHE INTERNAL "")
8963
add_subdirectory(${${gbName}_SOURCE_DIR} ${${gbName}_BINARY_DIR} EXCLUDE_FROM_ALL)
9064

9165
# Target must already exist
@@ -116,16 +90,10 @@ hide_variable(BENCHMARK_USE_LIBCXX)
11690
hide_variable(LIBRT)
11791

11892
set_target_properties(benchmark benchmark_main PROPERTIES FOLDER "Extern")
119-
target_compile_options(
120-
benchmark_main PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4244 /wd4800>
121-
)
93+
target_compile_options(benchmark_main PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4244 /wd4800>)
12294
target_compile_options(benchmark PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4244 /wd4800>)
12395

124-
if(MSVC AND MSVC_VERSION GREATER_EQUAL 1900)
125-
target_compile_definitions(
126-
benchmark PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
127-
)
128-
target_compile_definitions(
129-
benchmark_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
130-
)
96+
if(MSVC)
97+
target_compile_definitions(benchmark PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
98+
target_compile_definitions(benchmark_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
13199
endif()

0 commit comments

Comments
 (0)