Merge pull request #263 from eseiler/misc/fix

eseiler · web-flow · commit 1df6a3167236 · 2025-01-30T16:55:11.000+01:00
[INFRA,MISC] Update CMake, shadowing variable
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 include (cmake/version.cmake)
 
diff --git a/cmake/configuration.cmake b/cmake/configuration.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.5...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 # ----------------------------------------------------------------------------
 # Greeter
diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake
@@ -4,7 +4,7 @@
 
 # This file describes how HIBF will be packaged.
 
-cmake_minimum_required (VERSION 3.7)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 set (CPACK_GENERATOR "TXZ")
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 set (HIBF_SOURCE_FILES
      hierarchical_interleaved_bloom_filter.cpp
diff --git a/src/layout/hierarchical_binning.cpp b/src/layout/hierarchical_binning.cpp
@@ -420,8 +420,8 @@ size_t hierarchical_binning::add_lower_level(data_store & libf_data) const
     {
         // use simple binning to distribute remaining UBs
         // Simple binning is not bound by config.tmax
-        size_t const num_user_bins = next_multiple_of_64(number_of_user_bins);
-        size_t const number_of_technical_bins = subtract_empty_bins(num_user_bins, config.empty_bin_fraction);
+        size_t const num_user_bins_next_64 = next_multiple_of_64(number_of_user_bins);
+        size_t const number_of_technical_bins = subtract_empty_bins(num_user_bins_next_64, config.empty_bin_fraction);
         return simple_binning{libf_data, number_of_technical_bins}.execute(); // return id of maximum technical bin
     }
 }
diff --git a/test/all/CMakeLists.txt b/test/all/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 project (hibf_test)
 
 option (INSTALL_HIBF "" OFF)
diff --git a/test/cmake/diagnostics/list_missing_unit_tests.cmake b/test/cmake/diagnostics/list_missing_unit_tests.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 set (hibf_test_include_targets
      ""
diff --git a/test/cmake/diagnostics/list_unused_snippets.cmake b/test/cmake/diagnostics/list_unused_snippets.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 set (hibf_test_snippets
      ""
diff --git a/test/cmake/diagnostics/list_unused_unit_tests.cmake b/test/cmake/diagnostics/list_unused_unit_tests.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 set (hibf_test_targets
      ""
diff --git a/test/cmake/hibf_add_subdirectories.cmake b/test/cmake/hibf_add_subdirectories.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 # Calls add_subdirectory on all (direct) subdirectories of the given directory if they contain a `CMakeLists.txt`
 #
diff --git a/test/cmake/hibf_generate_snippet.cmake b/test/cmake/hibf_generate_snippet.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 # Generate snippets from a source_snippet
 #
diff --git a/test/cmake/hibf_macro_benchmark.cmake b/test/cmake/hibf_macro_benchmark.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 # Adds a macro benchmark target and a test which executes that macro benchmark
 #
diff --git a/test/cmake/hibf_path_longest_stem.cmake b/test/cmake/hibf_path_longest_stem.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 # A compatible function for cmake < 3.20 that basically returns `cmake_path (GET <filename> STEM LAST_ONLY <out_var>)`
 function (hibf_path_longest_stem out_var filename)
diff --git a/test/cmake/hibf_require_ccache.cmake b/test/cmake/hibf_require_ccache.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.15...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 include (FindPackageMessage)
 
diff --git a/test/cmake/hibf_test_component.cmake b/test/cmake/hibf_test_component.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 include (hibf_path_longest_stem)
 
diff --git a/test/cmake/hibf_test_files.cmake b/test/cmake/hibf_test_files.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 # Finds all files relative to the `test_base_path_` which satisfy the given file pattern.
 #
diff --git a/test/cmake/include_dependencies/add_include_dependencies.cmake b/test/cmake/include_dependencies/add_include_dependencies.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 include (diagnostics/list_missing_unit_tests)
 
diff --git a/test/cmake/include_dependencies/generate_include_dependencies.cmake b/test/cmake/include_dependencies/generate_include_dependencies.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.12...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 function (generate_include_dependencies_impl)
     cmake_parse_arguments (
diff --git a/test/coverage/CMakeLists.txt b/test/coverage/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 project (hibf_test_coverage CXX)
 
 # Add a custom build type: Coverage
diff --git a/test/documentation/CMakeLists.txt b/test/documentation/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.7)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 include (../../cmake/version.cmake)
 
diff --git a/test/documentation/hibf-doxygen-layout.cmake b/test/documentation/hibf-doxygen-layout.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 include (${HIBF_HEADER_PATH}/../test/cmake/hibf_test_files.cmake)
 
diff --git a/test/documentation/hibf-doxygen-package.cmake b/test/documentation/hibf-doxygen-package.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 set (CPACK_GENERATOR "TXZ")
 
diff --git a/test/documentation/hibf-doxygen.cmake b/test/documentation/hibf-doxygen.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 ### Find doxygen and dependency to DOT tool
 find_package (Doxygen REQUIRED)
diff --git a/test/header/CMakeLists.txt b/test/header/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.12...3.22)
+cmake_minimum_required (VERSION 3.20...3.31)
 project (hibf_header_test CXX)
 
 include (../hibf-test.cmake)
diff --git a/test/header/generate_header_source.cmake b/test/header/generate_header_source.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 option (HEADER_FILE_ABSOLUTE "")
 option (HEADER_FILE_INCLUDE "")
diff --git a/test/hibf-test.cmake b/test/hibf-test.cmake
@@ -6,7 +6,7 @@
 # HIBF. To build tests, run cmake on one of the sub-folders in this directory
 # which contain a CMakeLists.txt.
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 # Force alignment of benchmarked loops so that numbers are reliable.
 # For large loops and erratic seeming bench results the value might
diff --git a/test/iwyu/CMakeLists.txt b/test/iwyu/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 # cmake ../test/iwyu/ -DCMAKE_CXX_COMPILER="clang++-17" -DHIBF_IWYU_DIR=...
 # make -j2 2> out.txt
diff --git a/test/performance/CMakeLists.txt b/test/performance/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 project (hibf_test_performance CXX)
 
 include (../hibf-test.cmake)
diff --git a/test/snippet/CMakeLists.txt b/test/snippet/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 project (hibf_test_snippet CXX)
 
 include (../hibf-test.cmake)
diff --git a/test/snippet/compare_snippet_output.cmake b/test/snippet/compare_snippet_output.cmake
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 
 include ("${CMAKE_CURRENT_LIST_DIR}/../cmake/hibf_path_longest_stem.cmake")
 
diff --git a/test/tutorial/CMakeLists.txt b/test/tutorial/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.16...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 project (hibf_test_tutorial CXX)
 
 include (CheckIPOSupported)
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 project (hibf_test_unit CXX)
 
 include (../hibf-test.cmake)
diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.10...3.30)
+cmake_minimum_required (VERSION 3.20...3.31)
 project (hibf_util CXX)
 
 include (CheckIPOSupported)

Original file line number	Diff line number	Diff line change
`@@ -420,8 +420,8 @@ size_t hierarchical_binning::add_lower_level(data_store & libf_data) const`
`420`	`420`	`{`
`421`	`421`	`// use simple binning to distribute remaining UBs`
`422`	`422`	`// Simple binning is not bound by config.tmax`
`423`		`- size_t const num_user_bins = next_multiple_of_64(number_of_user_bins);`
`424`		`- size_t const number_of_technical_bins = subtract_empty_bins(num_user_bins, config.empty_bin_fraction);`
	`423`	`+ size_t const num_user_bins_next_64 = next_multiple_of_64(number_of_user_bins);`
	`424`	`+ size_t const number_of_technical_bins = subtract_empty_bins(num_user_bins_next_64, config.empty_bin_fraction);`
`425`	`425`	`return simple_binning{libf_data, number_of_technical_bins}.execute(); // return id of maximum technical bin`
`426`	`426`	`}`
`427`	`427`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik`
`3`	`3`	`# SPDX-License-Identifier: BSD-3-Clause`
`4`	`4`
`5`		`-cmake_minimum_required (VERSION 3.10...3.30)`
	`5`	`+cmake_minimum_required (VERSION 3.20...3.31)`
`6`	`6`
`7`	`7`	# Calls add_subdirectory on all (direct) subdirectories of the given directory if they contain a `CMakeLists.txt`
`8`	`8`	`#`