From 7605228f5e01866ffa96d18ac5b951f63165a6c9 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 Oct 2024 15:27:12 -0400 Subject: codespell: Fix typos --- .codespellrc | 2 +- Help/variable/CMAKE_FIND_PACKAGE_TARGETS_GLOBAL.rst | 2 +- Modules/FindCUDA.cmake | 4 ++-- Modules/Internal/CPack/CPackDeb.cmake | 2 +- Source/CTest/cmCTestScriptHandler.h | 2 +- Source/CTest/cmCTestTestHandler.h | 2 +- Source/cmGeneratorExpressionNode.cxx | 14 +++++++------- Templates/MSBuild/FlagTables/v142_CL.json | 2 +- Templates/MSBuild/FlagTables/v143_CL.json | 2 +- Tests/FortranModules/Submodules/obfuscated_parent.f90 | 4 ++-- Tests/RunCMake/CPack/DEB/Helpers.cmake | 2 +- Tests/RunCMake/CPack/README.txt | 2 +- .../CTestScriptVariableCommandLine-stderr.txt | 2 +- .../MyThirdPartyDependency/src/CMakeLists.txt | 8 ++++---- .../MyThirdPartyDependency/src/third_party.c | 14 ++++++++++++++ .../MyThirdPartyDependency/src/thirdparty.c | 14 -------------- Utilities/Scripts/update-third-party.bash | 2 +- 17 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/third_party.c delete mode 100644 Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/thirdparty.c diff --git a/.codespellrc b/.codespellrc index 00c6c52..c227872 100644 --- a/.codespellrc +++ b/.codespellrc @@ -5,4 +5,4 @@ check-hidden = quiet-level = 2 builtin = clear,rare,en-GB_to_en-US skip = */.git,*/build,*/Copyright.txt,*/CTestCustom.cmake.in,*/doxygen.config,*/Modules/Internal/CPack/NSIS.template.in,*/Source/CursesDialog/form/*,*/Source/kwsys/*,*/Tests/RunCMake/CPack/tests/DMG_SLA/German.*,*/Tests/RunCMake/ParseImplicitData/*.input,*/Tests/StringFileTest/test.utf8,*.pfx,*/Utilities/cm* -ignore-words-list = aci,ags,ake,ans,ba,ccompiler,cconfiguration,certi,conly,dependees,dne,dum,earch,ect,filetest,fo,helpfull,hiden,isnt,keypair,nd,ned,nin,nknown,ot,pard,seh,ser,te,upto,varn,vas,wee +ignore-words-list = aci,ags,ake,ans,ba,ccompiler,cconfiguration,certi,conly,copyin,dependees,dne,dum,earch,ect,filetest,fo,helpfull,hiden,isnt,keypair,nd,ned,nin,nknown,ot,pard,sectionin,seh,ser,te,upto,varn,vas,wee diff --git a/Help/variable/CMAKE_FIND_PACKAGE_TARGETS_GLOBAL.rst b/Help/variable/CMAKE_FIND_PACKAGE_TARGETS_GLOBAL.rst index fc9b315..da603aa 100644 --- a/Help/variable/CMAKE_FIND_PACKAGE_TARGETS_GLOBAL.rst +++ b/Help/variable/CMAKE_FIND_PACKAGE_TARGETS_GLOBAL.rst @@ -3,7 +3,7 @@ CMAKE_FIND_PACKAGE_TARGETS_GLOBAL .. versionadded:: 3.24 -Setting to ``TRUE`` promotes all :prop_tgt:`IMPORTED` targets discoverd +Setting to ``TRUE`` promotes all :prop_tgt:`IMPORTED` targets discovered by :command:`find_package` to a ``GLOBAL`` scope. diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 130b239..73cac25 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -1093,7 +1093,7 @@ endif() # Set the CUDA_LIBRARIES variable. This is the set of stuff to link against if you are # using the CUDA runtime. For the dynamic version of the runtime, most of the -# dependencies are brough in, but for the static version there are additional libraries +# dependencies are brought in, but for the static version there are additional libraries # and linker commands needed. # Initialize to empty set(CUDA_LIBRARIES) @@ -1449,7 +1449,7 @@ function(CUDA_COMPUTE_BUILD_PATH path build_path) # Avoid spaces string(REPLACE " " "_" bpath "${bpath}") - # Strip off the filename. I wait until here to do it, since removin the + # Strip off the filename. I wait until here to do it, since removing the # basename can make a path that looked like path/../basename turn into # path/.. (notice the trailing slash). get_filename_component(bpath "${bpath}" PATH) diff --git a/Modules/Internal/CPack/CPackDeb.cmake b/Modules/Internal/CPack/CPackDeb.cmake index 98e6d18..0169f61 100644 --- a/Modules/Internal/CPack/CPackDeb.cmake +++ b/Modules/Internal/CPack/CPackDeb.cmake @@ -238,7 +238,7 @@ function(cpack_deb_prepare_package_vars) endforeach() # Only dynamically linked ELF files are included - # Extract only file name infront of ":" + # Extract only file name in front of ":" foreach(_FILE IN LISTS CPACK_DEB_INSTALL_FILES) if(_FILE MATCHES "ELF.*dynamically linked") string(REGEX MATCH "(^.*):" _FILE_NAME "${_FILE}") diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h index 8aa07e7..7747750 100644 --- a/Source/CTest/cmCTestScriptHandler.h +++ b/Source/CTest/cmCTestScriptHandler.h @@ -67,7 +67,7 @@ public: void AddConfigurationScript(const std::string&, bool pscope); /** - * Run a dashboard using a specified confiuration script + * Run a dashboard using a specified configuration script */ int ProcessHandler() override; diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h index dd1bc59..c35af3f 100644 --- a/Source/CTest/cmCTestTestHandler.h +++ b/Source/CTest/cmCTestTestHandler.h @@ -65,7 +65,7 @@ public: */ void PopulateCustomVectors(cmMakefile* mf) override; - //! Control the use of the regular expresisons, call these methods to turn + //! Control the use of the regular expressions, call these methods to turn /// them on void UseIncludeRegExp(); void UseExcludeRegExp(); diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index 918dc28..7f4e4ac 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -4469,8 +4469,8 @@ static const struct ShellPathNode : public cmGeneratorExpressionNode const GeneratorExpressionContent* content, cmGeneratorExpressionDAGChecker* /*dagChecker*/) const override { - cmList listIn{ parameters.front() }; - if (listIn.empty()) { + cmList list_in{ parameters.front() }; + if (list_in.empty()) { reportError(context, content->GetOriginalExpression(), "\"\" is not an absolute path."); return std::string(); @@ -4478,17 +4478,17 @@ static const struct ShellPathNode : public cmGeneratorExpressionNode cmStateSnapshot snapshot = context->LG->GetStateSnapshot(); cmOutputConverter converter(snapshot); const char* separator = snapshot.GetState()->UseWindowsShell() ? ";" : ":"; - std::vector listOut; - listOut.reserve(listIn.size()); - for (auto const& in : listIn) { + std::vector list_out; + list_out.reserve(list_in.size()); + for (auto const& in : list_in) { if (!cmSystemTools::FileIsFullPath(in)) { reportError(context, content->GetOriginalExpression(), "\"" + in + "\" is not an absolute path."); return std::string(); } - listOut.emplace_back(converter.ConvertDirectorySeparatorsForShell(in)); + list_out.emplace_back(converter.ConvertDirectorySeparatorsForShell(in)); } - return cmJoin(listOut, separator); + return cmJoin(list_out, separator); } } shellPathNode; diff --git a/Templates/MSBuild/FlagTables/v142_CL.json b/Templates/MSBuild/FlagTables/v142_CL.json index 1d8a706..0566460 100644 --- a/Templates/MSBuild/FlagTables/v142_CL.json +++ b/Templates/MSBuild/FlagTables/v142_CL.json @@ -1090,7 +1090,7 @@ { "name": "GenerateModuleDependencies", "switch": "sourceDependencies:directives", - "comment": "Generate Module Dependenices File", + "comment": "Generate Module Dependencies File", "value": "true", "flags": [ "Continue" diff --git a/Templates/MSBuild/FlagTables/v143_CL.json b/Templates/MSBuild/FlagTables/v143_CL.json index 9d6e2b0..c5f9472 100644 --- a/Templates/MSBuild/FlagTables/v143_CL.json +++ b/Templates/MSBuild/FlagTables/v143_CL.json @@ -1092,7 +1092,7 @@ { "name": "GenerateModuleDependencies", "switch": "sourceDependencies:directives", - "comment": "Generate Module Dependenices File", + "comment": "Generate Module Dependencies File", "value": "true", "flags": [ "Continue" diff --git a/Tests/FortranModules/Submodules/obfuscated_parent.f90 b/Tests/FortranModules/Submodules/obfuscated_parent.f90 index f3e68be..9368f16 100644 --- a/Tests/FortranModules/Submodules/obfuscated_parent.f90 +++ b/Tests/FortranModules/Submodules/obfuscated_parent.f90 @@ -1,8 +1,8 @@ ! This module has two procedures from the "parent" module ! but it has different combinations 'module ' phrases -! in breaked lines for test of modules dependencies detection +! in broken lines for test of modules dependencies detection -! Module declaration on breaked line with reminder +! Module declaration on broken line with reminder module & obfuscated_parent; implicit none diff --git a/Tests/RunCMake/CPack/DEB/Helpers.cmake b/Tests/RunCMake/CPack/DEB/Helpers.cmake index 8904c69..39a316f 100644 --- a/Tests/RunCMake/CPack/DEB/Helpers.cmake +++ b/Tests/RunCMake/CPack/DEB/Helpers.cmake @@ -101,7 +101,7 @@ function(getMissingShlibsErrorExtra FILE RESULT_VAR) string(APPEND error_extra "; readelf \"\n") # Only dynamically linked ELF files are included - # Extract only file name infront of ":" + # Extract only file name in front of ":" foreach(_FILE IN LISTS deb_install_files) if(_FILE MATCHES "ELF.*shared object") string(REGEX MATCH "(^.*):" _FILE_NAME "${_FILE}") diff --git a/Tests/RunCMake/CPack/README.txt b/Tests/RunCMake/CPack/README.txt index d403db0..c63026e 100644 --- a/Tests/RunCMake/CPack/README.txt +++ b/Tests/RunCMake/CPack/README.txt @@ -173,7 +173,7 @@ This phase is executed if '/VerifyResult.cmake' script exists. VerifyResult.cmake script also automatically prints out standard output and standard error from CPack execution phase that is compared with '/-stdout.txt' regular expression and -'/-stderr.txt' regular expresson respectively. +'/-stderr.txt' regular expression respectively. NOTE: For subtests generator name can also be suffixed with subtest name and/or packaging type (MONOLITHIC, COMPONENT, GROUP) and in such cases the preferences of which file will be used are as follows: diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariableCommandLine-stderr.txt b/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariableCommandLine-stderr.txt index 206ab21..e9327a3 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariableCommandLine-stderr.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/CTestScriptVariableCommandLine-stderr.txt @@ -1,2 +1,2 @@ Unable to find executable:.*MyThirdPartyDependency/src(/[^/ -]+)?/thirdparty +]+)?/third_party diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/CMakeLists.txt b/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/CMakeLists.txt index 2f57d55..6c86f76 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/CMakeLists.txt +++ b/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/CMakeLists.txt @@ -3,8 +3,8 @@ project(MyThirdPartyDependency) include(CTest) -add_executable(thirdparty thirdparty.c) -add_test(NAME thirdparty COMMAND thirdparty) +add_executable(third_party third_party.c) +add_test(NAME third_party COMMAND third_party) -set_property(TARGET thirdparty PROPERTY LABELS NotASubproject) -set_property(TEST thirdparty PROPERTY LABELS NotASubproject) +set_property(TARGET third_party PROPERTY LABELS NotASubproject) +set_property(TEST third_party PROPERTY LABELS NotASubproject) diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/third_party.c b/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/third_party.c new file mode 100644 index 0000000..009162d --- /dev/null +++ b/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/third_party.c @@ -0,0 +1,14 @@ +#include + +int main(void) +{ + printf(This function has an error!\n"); + n = 5; + return 0; +} + +int notcalled(void) +{ + printf(This function doesn't get called.\n"); + return 0; +} diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/thirdparty.c b/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/thirdparty.c deleted file mode 100644 index 009162d..0000000 --- a/Tests/RunCMake/ctest_labels_for_subprojects/MyThirdPartyDependency/src/thirdparty.c +++ /dev/null @@ -1,14 +0,0 @@ -#include - -int main(void) -{ - printf(This function has an error!\n"); - n = 5; - return 0; -} - -int notcalled(void) -{ - printf(This function doesn't get called.\n"); - return 0; -} diff --git a/Utilities/Scripts/update-third-party.bash b/Utilities/Scripts/update-third-party.bash index bfe6828..cf76b17 100644 --- a/Utilities/Scripts/update-third-party.bash +++ b/Utilities/Scripts/update-third-party.bash @@ -25,7 +25,7 @@ # ownership # A git author name/email for the commits. # subtree -# The location of the thirdparty package within the main source +# The location of the third-party package within the main source # tree. # repo # The git repository to use as upstream. -- cgit v0.12 From 570f54c8f759780938e5f3dd697857520fcab686 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 Oct 2024 17:02:42 -0400 Subject: clang-tidy: ignore warnings new in version 19 These warnings can be fixed in the future. Ignore them for now. Also drop some suppressions we no longer need. --- .clang-tidy | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 6d2edd4..c85fd67 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -2,6 +2,7 @@ Checks: "-*,\ bugprone-*,\ -bugprone-assignment-in-if-condition,\ +-bugprone-crtp-constructor-accessibility,\ -bugprone-easily-swappable-parameters,\ -bugprone-empty-catch,\ -bugprone-implicit-widening-of-multiplication-result,\ @@ -10,19 +11,23 @@ bugprone-*,\ -bugprone-misplaced-widening-cast,\ -bugprone-multi-level-implicit-pointer-conversion,\ -bugprone-narrowing-conversions,\ +-bugprone-return-const-ref-from-parameter,\ +-bugprone-suspicious-stringview-data-usage,\ -bugprone-switch-missing-default-case,\ -bugprone-too-small-loop-variable,\ -bugprone-unchecked-optional-access,\ -bugprone-unused-local-non-trivial-variable,\ -bugprone-unused-return-value,\ +-bugprone-use-after-move,\ misc-*,\ -misc-confusable-identifiers,\ -misc-const-correctness,\ -misc-include-cleaner,\ --misc-no-recursion,\ -misc-non-private-member-variables-in-classes,\ +-misc-no-recursion,\ -misc-static-assert,\ -misc-use-anonymous-namespace,\ +-misc-use-internal-linkage,\ modernize-*,\ -modernize-avoid-c-arrays,\ -modernize-macro-to-enum,\ @@ -36,13 +41,14 @@ modernize-*,\ performance-*,\ -performance-avoid-endl,\ -performance-enum-size,\ --performance-inefficient-vector-operation,\ --performance-noexcept-swap,\ +-performance-unnecessary-copy-initialization,\ +-performance-unnecessary-value-param,\ readability-*,\ -readability-avoid-nested-conditional-operator,\ -readability-avoid-return-with-void-value,\ -readability-avoid-unconditional-preprocessor-if,\ -readability-convert-member-functions-to-static,\ +-readability-enum-initial-value,\ -readability-function-cognitive-complexity,\ -readability-function-size,\ -readability-identifier-length,\ @@ -51,6 +57,7 @@ readability-*,\ -readability-inconsistent-declaration-parameter-name,\ -readability-magic-numbers,\ -readability-make-member-function-const,\ +-readability-math-missing-parentheses,\ -readability-named-parameter,\ -readability-redundant-casting,\ -readability-redundant-declaration,\ @@ -61,6 +68,7 @@ readability-*,\ -readability-static-accessed-through-instance,\ -readability-suspicious-call-argument,\ -readability-uppercase-literal-suffix,\ +-readability-use-std-min-max,\ cmake-*,\ -cmake-ostringstream-use-cmstrcat,\ -cmake-string-concatenation-use-cmstrcat,\ -- cgit v0.12 From 6fdb15672d99694e94467d82232f964982f82f5b Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 Oct 2024 16:58:11 -0400 Subject: Tests: Update FindBoost.TestPython for Python 3.13 and 3.14 Follow up the python 3.13 and 3.14 support from: * commit be958c8f35 (FindPython: Add support for Python 3.14, 2024-10-17) * commit dfab044c44 (FindPython: add support for Python 3.13, 2023-08-14) with an update for the FindBoost test. --- Tests/FindBoost/TestPython/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/FindBoost/TestPython/CMakeLists.txt b/Tests/FindBoost/TestPython/CMakeLists.txt index 494c9a3..166a411 100644 --- a/Tests/FindBoost/TestPython/CMakeLists.txt +++ b/Tests/FindBoost/TestPython/CMakeLists.txt @@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 3.14) project(TestFindBoostPython CXX) include(CTest) -find_package(Boost OPTIONAL_COMPONENTS python27 python34 python35 python36 python37 python38 python39 python310 python311 python312) +find_package(Boost OPTIONAL_COMPONENTS python27 python34 python35 python36 python37 python38 python39 python310 python311 python312 python313 python314) set(FAILTEST TRUE) -foreach (v IN ITEMS 27 34 35 36 37 38 39 310 311 312) +foreach (v IN ITEMS 27 34 35 36 37 38 39 310 311 312 313 314) if (Boost_PYTHON${v}_FOUND) set(FAILTEST FALSE) break() -- cgit v0.12 From be540dbe19caf16818f6db5bf51d7c1dd2cd1b60 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 Oct 2024 19:12:51 -0400 Subject: Tests: Fix FILE stream leaks in helper programs --- Tests/RunCMake/detect_jobserver.c | 2 ++ Tests/RunCMake/pseudo_llvm-rc.c | 16 +++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Tests/RunCMake/detect_jobserver.c b/Tests/RunCMake/detect_jobserver.c index 67cc7db..04fb1f2 100644 --- a/Tests/RunCMake/detect_jobserver.c +++ b/Tests/RunCMake/detect_jobserver.c @@ -162,6 +162,7 @@ int main(int argc, char** argv) jobserver = jobserver_auth(message); if (jobserver == NULL) { + fclose(fp); fprintf(stderr, "%s\n", message); return 1; } @@ -171,6 +172,7 @@ int main(int argc, char** argv) #else result = posix(jobserver, message); #endif + fclose(fp); free(jobserver); message[MAX_MESSAGE_LENGTH] = '\0'; diff --git a/Tests/RunCMake/pseudo_llvm-rc.c b/Tests/RunCMake/pseudo_llvm-rc.c index 65f0a9e..e495e8d 100644 --- a/Tests/RunCMake/pseudo_llvm-rc.c +++ b/Tests/RunCMake/pseudo_llvm-rc.c @@ -9,6 +9,8 @@ int main(int argc, char* argv[]) { FILE* source; FILE* target; + char buffer[500]; + size_t n; int i; for (i = 1; i < argc; ++i) { if (strcmp(argv[i], "-bad") == 0) { @@ -22,13 +24,13 @@ int main(int argc, char* argv[]) return 1; } target = fopen(argv[argc - 2], "wb"); - if (target != NULL) { - char buffer[500]; - size_t n = fread(buffer, 1, sizeof(buffer), source); - fwrite(buffer, 1, n, target); + if (target == NULL) { fclose(source); - fclose(target); - return 0; + return 1; } - return 1; + n = fread(buffer, 1, sizeof(buffer), source); + fwrite(buffer, 1, n, target); + fclose(source); + fclose(target); + return 0; } -- cgit v0.12 From 92272c4a175105a59a37bde333f73171f1a4538f Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 24 Oct 2024 10:42:41 -0400 Subject: Tests/RunCMake/BuildDepends: Skip LinkDepends with broken GNU ld 2.43 Issue: #26401 --- Tests/RunCMake/BuildDepends/LinkDependsCheck.cmake | 9 ++++++--- Tests/RunCMake/BuildDepends/RunCMakeTest.cmake | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Tests/RunCMake/BuildDepends/LinkDependsCheck.cmake b/Tests/RunCMake/BuildDepends/LinkDependsCheck.cmake index 596e1eb..f6d4a6c 100644 --- a/Tests/RunCMake/BuildDepends/LinkDependsCheck.cmake +++ b/Tests/RunCMake/BuildDepends/LinkDependsCheck.cmake @@ -1,9 +1,12 @@ enable_language(C) -file(WRITE "${CMAKE_BINARY_DIR}/LinkDependsUseLinker.cmake" - "set(CMAKE_LINK_DEPENDS_USE_LINKER ${CMAKE_LINK_DEPENDS_USE_LINKER}) -set(CMAKE_C_LINK_DEPENDS_USE_LINKER ${CMAKE_C_LINK_DEPENDS_USE_LINKER})\n") +file(WRITE "${CMAKE_BINARY_DIR}/LinkDependsUseLinker.cmake" " +set(CMAKE_LINK_DEPENDS_USE_LINKER ${CMAKE_LINK_DEPENDS_USE_LINKER}) +set(CMAKE_C_LINK_DEPENDS_USE_LINKER ${CMAKE_C_LINK_DEPENDS_USE_LINKER}) +set(CMAKE_C_COMPILER_LINKER_ID ${CMAKE_C_COMPILER_LINKER_ID}) +set(CMAKE_C_COMPILER_LINKER_VERSION ${CMAKE_C_COMPILER_LINKER_VERSION}) +") file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/check-$>.cmake" diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake index a585dce..5176f5b 100644 --- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake +++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake @@ -208,7 +208,10 @@ if (RunCMake_GENERATOR MATCHES "Make|Ninja") run_BuildDepends(LinkDependsCheck) include("${RunCMake_BINARY_DIR}/LinkDependsCheck-build/LinkDependsUseLinker.cmake") if ((NOT DEFINED CMAKE_LINK_DEPENDS_USE_LINKER OR CMAKE_LINK_DEPENDS_USE_LINKER) - AND CMAKE_C_LINK_DEPENDS_USE_LINKER) + AND CMAKE_C_LINK_DEPENDS_USE_LINKER + # FIXME(#26401): GNU binutils 2.43 broke dependency-file generation. + AND NOT (CMAKE_C_COMPILER_LINKER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_LINKER_VERSION VERSION_GREATER_EQUAL "2.43") + ) run_BuildDepends(LinkDependsExternalLibrary) unset(run_BuildDepends_skip_step_2) run_BuildDepends(LinkDepends -DMAKE_SUPPORTS_SPACES=${MAKE_SUPPORTS_SPACES}) -- cgit v0.12 From f60b4c553e120ac7aef376bb06c7eea97a404da1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Sat, 26 Oct 2024 05:57:02 -0400 Subject: Utilities/Sphinx: Tell linkcheck to not treat timeouts as broken Sphinx 7.3 warns: sphinx/builders/linkcheck.py:86: RemovedInSphinx80Warning: The default value for 'linkcheck_report_timeouts_as_broken' will change to False in Sphinx 8, ... Configure that behavior explicitly. --- Utilities/Sphinx/conf.py.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in index 09a7d5a..dca6794 100644 --- a/Utilities/Sphinx/conf.py.in +++ b/Utilities/Sphinx/conf.py.in @@ -103,3 +103,5 @@ linkcheck_allowed_redirects = { r'https://openjdk\.java\.net/jeps/313': r'https://openjdk\.org:443/jeps/313', r'https://www\.sphinx-doc\.org': r'https://www\.sphinx-doc\.org/en/master/', } + +linkcheck_report_timeouts_as_broken = False -- cgit v0.12 From 51ed0eba18988af38ae9da0603b47d534ca50439 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 Oct 2024 19:16:38 -0400 Subject: KWSys: SystemInformation: Add missing EOF check when reading /proc/cpuinfo Backport KWSys upstream commit `6e847d08b` (SystemInformation: Add missing EOF check when reading /proc/cpuinfo, 2024-10-23) to the CMake 3.31 release branch. --- Source/kwsys/SystemInformation.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 4efea54..933d649 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -3405,8 +3405,9 @@ bool SystemInformationImplementation::RetrieveInformationFromCpuInfoFile() } size_t fileSize = 0; - while (!feof(fd)) { - buffer += static_cast(fgetc(fd)); + int fc; + while ((fc = fgetc(fd)) != EOF) { + buffer += static_cast(fc); fileSize++; } fclose(fd); -- cgit v0.12 From 5c7a55edc2f11b96c93cf207773c176ade66326f Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 Oct 2024 19:24:03 -0400 Subject: cmStringAlgorithms: Fix core.NonNullParamChecker diagnostic in cmAlphaNum --- Source/cmStringAlgorithms.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmStringAlgorithms.h b/Source/cmStringAlgorithms.h index 3d7f9b0..2bd615a 100644 --- a/Source/cmStringAlgorithms.h +++ b/Source/cmStringAlgorithms.h @@ -146,7 +146,7 @@ public: { } cmAlphaNum(const char* str) - : View_(str) + : View_(str ? cm::string_view(str) : cm::string_view()) { } cmAlphaNum(char ch) -- cgit v0.12 From 92d5c48b143e79ed6e2d06c39d2b7b75b3d85623 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 Oct 2024 19:25:20 -0400 Subject: CTestCustom: Suppress clang-analyzer warning in libuv This is third-party code. --- CTestCustom.cmake.in | 1 + 1 file changed, 1 insertion(+) diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in index bc88271..d924480 100644 --- a/CTestCustom.cmake.in +++ b/CTestCustom.cmake.in @@ -101,6 +101,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION "libuv/src/.*:[0-9]+:[0-9]+: warning: 1st function call argument is an uninitialized value" "libuv/src/.*:[0-9]+:[0-9]+: warning: Dereference of null pointer" "libuv/src/.*:[0-9]+:[0-9]+: warning: The left operand of '[^']+' is a garbage value" + "libuv/src/.*:[0-9]+:[0-9]+: warning: Value of '[^']+' was not checked and may be overwritten by function '[^']+'" "nghttp2/lib/.*:[0-9]+:[0-9]+: warning: Access to field '[^']+' results in a dereference of a null pointer" "nghttp2/lib/.*:[0-9]+:[0-9]+: warning: Dereference of null pointer" "nghttp2/lib/.*:[0-9]+:[0-9]+: warning: Value stored to '[^']+' is never read" -- cgit v0.12 From e6da61fcd938e874f7ae3f75ba6120ebe17c1f71 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 24 Oct 2024 17:26:52 -0400 Subject: ci: Run Fedora + Makefiles job on x86_64-v3 hosts for mpich+libfabric Similar to commit 18145e8745 (ci: Update FindMPI test environment for mpich on Fedora 39, 2023-11-16, v3.28.0-rc6~19^2~1), libfabric fails with SIGILL on older hardware. --- .gitlab-ci.yml | 4 ++-- .gitlab/os-linux.yml | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b352b06..ea90d80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -288,7 +288,7 @@ t:fedora40-makefiles: extends: - .fedora40_makefiles - .cmake_test_linux_release - - .linux_x86_64_tags + - .linux_x86_64_v3_tags - .run_dependent - .needs_centos7_x86_64 @@ -296,7 +296,7 @@ t:fedora40-makefiles-nospace: extends: - .fedora40_makefiles - .cmake_test_linux_release - - .linux_x86_64_tags + - .linux_x86_64_v3_tags - .cmake_junit_artifacts - .run_dependent - .needs_centos7_x86_64 diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 3edef20..95cd499 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -481,6 +481,13 @@ - docker - linux-x86_64 +.linux_x86_64_v3_tags: + tags: + - cmake + - build + - docker + - linux-x86_64-v3 + .linux_x86_64_tags_x11: tags: - cmake -- cgit v0.12 From 46d89b8524f4fa0215985911abbdfee9d8df6269 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 Oct 2024 13:00:10 -0400 Subject: ci: update Linux image to Fedora 41 --- .gitlab/ci/docker/fedora40/Dockerfile | 58 ------------ .gitlab/ci/docker/fedora40/deps_packages.lst | 126 --------------------------- .gitlab/ci/docker/fedora40/install_deps.sh | 31 ------- .gitlab/ci/docker/fedora40/install_iwyu.sh | 42 --------- .gitlab/ci/docker/fedora40/install_rvm.sh | 25 ------ .gitlab/ci/docker/fedora40/iwyu_packages.lst | 7 -- .gitlab/ci/docker/fedora40/rvm_packages.lst | 18 ---- .gitlab/ci/docker/fedora41/Dockerfile | 58 ++++++++++++ .gitlab/ci/docker/fedora41/deps_packages.lst | 125 ++++++++++++++++++++++++++ .gitlab/ci/docker/fedora41/install_deps.sh | 22 +++++ .gitlab/ci/docker/fedora41/install_iwyu.sh | 44 ++++++++++ .gitlab/ci/docker/fedora41/install_rvm.sh | 25 ++++++ .gitlab/ci/docker/fedora41/iwyu_packages.lst | 7 ++ .gitlab/ci/docker/fedora41/rvm_packages.lst | 19 ++++ 14 files changed, 300 insertions(+), 307 deletions(-) delete mode 100644 .gitlab/ci/docker/fedora40/Dockerfile delete mode 100644 .gitlab/ci/docker/fedora40/deps_packages.lst delete mode 100755 .gitlab/ci/docker/fedora40/install_deps.sh delete mode 100755 .gitlab/ci/docker/fedora40/install_iwyu.sh delete mode 100755 .gitlab/ci/docker/fedora40/install_rvm.sh delete mode 100644 .gitlab/ci/docker/fedora40/iwyu_packages.lst delete mode 100644 .gitlab/ci/docker/fedora40/rvm_packages.lst create mode 100644 .gitlab/ci/docker/fedora41/Dockerfile create mode 100644 .gitlab/ci/docker/fedora41/deps_packages.lst create mode 100755 .gitlab/ci/docker/fedora41/install_deps.sh create mode 100755 .gitlab/ci/docker/fedora41/install_iwyu.sh create mode 100755 .gitlab/ci/docker/fedora41/install_rvm.sh create mode 100644 .gitlab/ci/docker/fedora41/iwyu_packages.lst create mode 100644 .gitlab/ci/docker/fedora41/rvm_packages.lst diff --git a/.gitlab/ci/docker/fedora40/Dockerfile b/.gitlab/ci/docker/fedora40/Dockerfile deleted file mode 100644 index 896456c..0000000 --- a/.gitlab/ci/docker/fedora40/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -# syntax=docker/dockerfile:1 - -ARG BASE_IMAGE=fedora:40 - -FROM ${BASE_IMAGE} AS dnf-cache -# Populate DNF cache w/ the fresh metadata and prefetch packages. -RUN --mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \ - --mount=type=bind,source=iwyu_packages.lst,target=/root/iwyu_packages.lst \ - --mount=type=bind,source=rvm_packages.lst,target=/root/rvm_packages.lst \ - --mount=type=tmpfs,target=/var/log \ - --mount=type=tmpfs,target=/tmp \ - dnf install \ - --setopt=install_weak_deps=False \ - --setopt=fastestmirror=True \ - --setopt=max_parallel_downloads=10 \ - --downloadonly \ - -y \ - $(grep -h '^[^#]\+$' /root/*.lst) - - -FROM ${BASE_IMAGE} AS rvm-build -LABEL maintainer="Ben Boeckel " - -RUN --mount=type=bind,source=install_rvm.sh,target=/root/install_rvm.sh \ - --mount=type=bind,source=rvm_packages.lst,target=/root/rvm_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/cache/dnf,target=/var/cache/dnf,sharing=private \ - --mount=type=tmpfs,target=/var/log \ - --mount=type=tmpfs,target=/tmp \ - sh /root/install_rvm.sh - - -FROM ${BASE_IMAGE} AS iwyu-build -LABEL maintainer="Kyle Edwards " - -RUN --mount=type=bind,source=install_iwyu.sh,target=/root/install_iwyu.sh \ - --mount=type=bind,source=iwyu_packages.lst,target=/root/iwyu_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/cache/dnf,target=/var/cache/dnf,sharing=private \ - --mount=type=tmpfs,target=/var/log \ - --mount=type=tmpfs,target=/tmp \ - sh /root/install_iwyu.sh - - -FROM ${BASE_IMAGE} -LABEL maintainer="Ben Boeckel " - -RUN --mount=type=bind,source=install_deps.sh,target=/root/install_deps.sh \ - --mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/cache/dnf,target=/var/cache/dnf,sharing=private \ - --mount=type=cache,target=/var/cache/pip \ - --mount=type=tmpfs,target=/var/log \ - --mount=type=tmpfs,target=/tmp \ - sh /root/install_deps.sh - -RUN --mount=type=bind,from=rvm-build,source=/root,target=/root \ - tar -C /usr/local -xf /root/rvm.tar - -RUN --mount=type=bind,from=iwyu-build,source=/root,target=/root \ - tar -C / -xf /root/iwyu.tar diff --git a/.gitlab/ci/docker/fedora40/deps_packages.lst b/.gitlab/ci/docker/fedora40/deps_packages.lst deleted file mode 100644 index 9fc0a5c..0000000 --- a/.gitlab/ci/docker/fedora40/deps_packages.lst +++ /dev/null @@ -1,126 +0,0 @@ -# Install build requirements. -ncurses-devel -openssl-devel -qt5-qtbase-devel -qt6-qtbase-devel - -# Install development tools. -clang -clang-devel -clang-tools-extra -clang-tools-extra-devel -compiler-rt -flang -gcc-c++ -git-core -lfortran -llvm-devel -make - -# Install optional external build dependencies. -bzip2-devel -expat-devel -jsoncpp-devel -libarchive-devel -libcurl-devel -libuv-devel -libuv-devel -libzstd-devel -rhash-devel -xz-devel -zlib-devel - -# Install documentation tools. -python3-sphinx -python3-sphinxcontrib-qthelp -texinfo -qt5-qttools-devel -qt6-qttools-devel - -# Install lint tools. -clang-analyzer -codespell - -# Tools needed for the test suite. -findutils -file -jq -which - -# Install ASM_NASM language toolchain. -nasm - -# Packages needed to test CTest. -breezy -subversion -mercurial - -# Packages needed to test CPack. -rpm-build - -# Packages needed to test find modules. -alsa-lib-devel -blas-devel -boost-devel boost-python3-devel -bzip2-devel -cups-devel -DevIL-devel -doxygen -expat-devel -fontconfig-devel -freeglut-devel -freetype-devel -gdal-devel -gettext -giflib-devel -glew-devel -gmock -gnutls-devel -grpc-devel grpc-plugins -gsl-devel -gtest-devel -gtk2-devel -hdf5-devel -hdf5-mpich-devel -hdf5-openmpi-devel -ImageMagick-c++-devel -jasper-devel -java-11-openjdk-devel -jsoncpp-devel -lapack-devel -libarchive-devel -libcurl-devel -libicu-devel -libinput-devel systemd-devel -libjpeg-turbo-devel -libomp-devel -libpng-devel -opensp-devel -postgresql-server-devel -libtiff-devel -libuv-devel -libxml2-devel -libxslt-devel -mpich-devel -openal-soft-devel -openmpi-devel -patch -perl -protobuf-devel protobuf-c-devel protobuf-lite-devel -pypy2 pypy2-devel -pypy3 pypy3-devel -python2 python2-devel -python3 python3-devel python3-numpy -python3-jsmin python3-jsonschema -ruby rubygems ruby-devel -SDL-devel -sqlite-devel -swig -unixODBC-devel -wxGTK-devel -xalan-c-devel -xerces-c-devel -xz-devel - -# Packages needed to test third-party binaries. -ncurses-compat-libs diff --git a/.gitlab/ci/docker/fedora40/install_deps.sh b/.gitlab/ci/docker/fedora40/install_deps.sh deleted file mode 100755 index 70e2293..0000000 --- a/.gitlab/ci/docker/fedora40/install_deps.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -set -e - -dnf install \ - --setopt=install_weak_deps=False \ - --setopt=fastestmirror=True \ - --setopt=max_parallel_downloads=10 \ - -y \ - $(grep '^[^#]\+$' /root/deps_packages.lst) - -# Fedora no longer packages python2 numpy. -curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o - | python2 -pip2.7 install --disable-pip-version-check --no-input --no-compile --cache-dir /var/cache/pip numpy - -# Remove demos and Python2 tests -for p in Demo test; do - rm -rf /usr/lib64/python2.7/${p} -done - -# Remove tests for numpy -for v in 2.7 3.12; do - find /usr/lib64/python${v}/site-packages/numpy -type d -a -name tests -exec rm -rf {} + -done - -# Remove some other packages tests -find /usr/lib64/python3.12/site-packages/breezy -type d -a -name tests -exec rm -rf {} + - -# Perforce -curl -L https://www.perforce.com/downloads/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz -o - \ - | tar -C /usr/local/bin -xvzf - -- p4 p4d diff --git a/.gitlab/ci/docker/fedora40/install_iwyu.sh b/.gitlab/ci/docker/fedora40/install_iwyu.sh deleted file mode 100755 index 50ed612..0000000 --- a/.gitlab/ci/docker/fedora40/install_iwyu.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -# Install development tools. -dnf install \ - --setopt=install_weak_deps=False \ - --setopt=fastestmirror=True \ - --setopt=max_parallel_downloads=10 \ - -y \ - $(grep '^[^#]\+$' /root/iwyu_packages.lst) - -cd /root -git clone "https://github.com/include-what-you-use/include-what-you-use.git" -cd include-what-you-use -readonly llvm_full_version="$( clang --version | head -n1 | cut -d' ' -f3 )" -readonly llvm_version="$( echo "$llvm_full_version" | cut -d. -f-1 )" -git checkout "clang_$llvm_version" -git apply < Date: Wed, 23 Oct 2024 14:18:13 -0400 Subject: ci: use Fedora 41 images and environments --- .gitlab-ci.yml | 92 ++++++++-------- .gitlab/ci/configure_fedora40_asan.cmake | 4 - .gitlab/ci/configure_fedora40_clang_analyzer.cmake | 3 - .gitlab/ci/configure_fedora40_common.cmake | 7 -- .gitlab/ci/configure_fedora40_common_clang.cmake | 17 --- .../ci/configure_fedora40_common_lfortran.cmake | 5 - .gitlab/ci/configure_fedora40_extdeps.cmake | 1 - .gitlab/ci/configure_fedora40_makefiles.cmake | 117 --------------------- .../ci/configure_fedora40_makefiles_clang.cmake | 5 - .../ci/configure_fedora40_makefiles_lfortran.cmake | 1 - .../configure_fedora40_makefiles_symlinked.cmake | 2 - .gitlab/ci/configure_fedora40_ninja.cmake | 18 ---- .gitlab/ci/configure_fedora40_ninja_clang.cmake | 3 - .gitlab/ci/configure_fedora40_ninja_lfortran.cmake | 1 - .gitlab/ci/configure_fedora40_ninja_multi.cmake | 6 -- .../ci/configure_fedora40_ninja_multi_clang.cmake | 3 - .gitlab/ci/configure_fedora40_sphinx.cmake | 2 - .gitlab/ci/configure_fedora40_sphinx_package.cmake | 13 --- .gitlab/ci/configure_fedora40_tidy.cmake | 6 -- .gitlab/ci/configure_fedora41_asan.cmake | 4 + .gitlab/ci/configure_fedora41_clang_analyzer.cmake | 3 + .gitlab/ci/configure_fedora41_common.cmake | 7 ++ .gitlab/ci/configure_fedora41_common_clang.cmake | 17 +++ .../ci/configure_fedora41_common_lfortran.cmake | 5 + .gitlab/ci/configure_fedora41_extdeps.cmake | 1 + .gitlab/ci/configure_fedora41_makefiles.cmake | 115 ++++++++++++++++++++ .../ci/configure_fedora41_makefiles_clang.cmake | 5 + .../ci/configure_fedora41_makefiles_lfortran.cmake | 1 + .../configure_fedora41_makefiles_symlinked.cmake | 2 + .gitlab/ci/configure_fedora41_ninja.cmake | 18 ++++ .gitlab/ci/configure_fedora41_ninja_clang.cmake | 3 + .gitlab/ci/configure_fedora41_ninja_lfortran.cmake | 1 + .gitlab/ci/configure_fedora41_ninja_multi.cmake | 6 ++ .../ci/configure_fedora41_ninja_multi_clang.cmake | 3 + .gitlab/ci/configure_fedora41_sphinx.cmake | 2 + .gitlab/ci/configure_fedora41_sphinx_package.cmake | 13 +++ .gitlab/ci/configure_fedora41_tidy.cmake | 6 ++ .gitlab/ci/ctest_memcheck_fedora40_asan.lsan.supp | 1 - .gitlab/ci/ctest_memcheck_fedora41_asan.lsan.supp | 1 + .gitlab/ci/env_fedora40_asan.sh | 2 - .gitlab/ci/env_fedora40_clang_analyzer.sh | 2 - .gitlab/ci/env_fedora40_common_clang.sh | 3 - .gitlab/ci/env_fedora40_common_lfortran.sh | 1 - .gitlab/ci/env_fedora40_extdeps.sh | 1 - .gitlab/ci/env_fedora40_makefiles.cmake | 1 - .gitlab/ci/env_fedora40_makefiles.sh | 8 -- .gitlab/ci/env_fedora40_makefiles_clang.sh | 1 - .gitlab/ci/env_fedora40_makefiles_lfortran.sh | 1 - .gitlab/ci/env_fedora40_makefiles_symlinked.cmake | 1 - .gitlab/ci/env_fedora40_makefiles_symlinked.sh | 1 - .gitlab/ci/env_fedora40_ninja.sh | 3 - .gitlab/ci/env_fedora40_ninja_clang.sh | 1 - .gitlab/ci/env_fedora40_ninja_lfortran.sh | 1 - .gitlab/ci/env_fedora40_ninja_multi.sh | 3 - .gitlab/ci/env_fedora40_ninja_multi_clang.sh | 1 - .gitlab/ci/env_fedora41_asan.sh | 2 + .gitlab/ci/env_fedora41_clang_analyzer.sh | 2 + .gitlab/ci/env_fedora41_common_clang.sh | 3 + .gitlab/ci/env_fedora41_common_lfortran.sh | 1 + .gitlab/ci/env_fedora41_extdeps.sh | 1 + .gitlab/ci/env_fedora41_makefiles.cmake | 1 + .gitlab/ci/env_fedora41_makefiles.sh | 8 ++ .gitlab/ci/env_fedora41_makefiles_clang.sh | 1 + .gitlab/ci/env_fedora41_makefiles_lfortran.sh | 1 + .gitlab/ci/env_fedora41_makefiles_symlinked.cmake | 1 + .gitlab/ci/env_fedora41_makefiles_symlinked.sh | 1 + .gitlab/ci/env_fedora41_ninja.sh | 3 + .gitlab/ci/env_fedora41_ninja_clang.sh | 1 + .gitlab/ci/env_fedora41_ninja_lfortran.sh | 1 + .gitlab/ci/env_fedora41_ninja_multi.sh | 3 + .gitlab/ci/env_fedora41_ninja_multi_clang.sh | 1 + .gitlab/ci/post_build_fedora40_tidy.sh | 21 ---- .gitlab/ci/post_build_fedora41_tidy.sh | 21 ++++ .gitlab/ci/pre_build_fedora40_tidy.sh | 9 -- .gitlab/ci/pre_build_fedora41_tidy.sh | 9 ++ .gitlab/os-linux.yml | 100 +++++++++--------- .gitlab/upload.yml | 4 +- 77 files changed, 372 insertions(+), 374 deletions(-) delete mode 100644 .gitlab/ci/configure_fedora40_asan.cmake delete mode 100644 .gitlab/ci/configure_fedora40_clang_analyzer.cmake delete mode 100644 .gitlab/ci/configure_fedora40_common.cmake delete mode 100644 .gitlab/ci/configure_fedora40_common_clang.cmake delete mode 100644 .gitlab/ci/configure_fedora40_common_lfortran.cmake delete mode 100644 .gitlab/ci/configure_fedora40_extdeps.cmake delete mode 100644 .gitlab/ci/configure_fedora40_makefiles.cmake delete mode 100644 .gitlab/ci/configure_fedora40_makefiles_clang.cmake delete mode 100644 .gitlab/ci/configure_fedora40_makefiles_lfortran.cmake delete mode 100644 .gitlab/ci/configure_fedora40_makefiles_symlinked.cmake delete mode 100644 .gitlab/ci/configure_fedora40_ninja.cmake delete mode 100644 .gitlab/ci/configure_fedora40_ninja_clang.cmake delete mode 100644 .gitlab/ci/configure_fedora40_ninja_lfortran.cmake delete mode 100644 .gitlab/ci/configure_fedora40_ninja_multi.cmake delete mode 100644 .gitlab/ci/configure_fedora40_ninja_multi_clang.cmake delete mode 100644 .gitlab/ci/configure_fedora40_sphinx.cmake delete mode 100644 .gitlab/ci/configure_fedora40_sphinx_package.cmake delete mode 100644 .gitlab/ci/configure_fedora40_tidy.cmake create mode 100644 .gitlab/ci/configure_fedora41_asan.cmake create mode 100644 .gitlab/ci/configure_fedora41_clang_analyzer.cmake create mode 100644 .gitlab/ci/configure_fedora41_common.cmake create mode 100644 .gitlab/ci/configure_fedora41_common_clang.cmake create mode 100644 .gitlab/ci/configure_fedora41_common_lfortran.cmake create mode 100644 .gitlab/ci/configure_fedora41_extdeps.cmake create mode 100644 .gitlab/ci/configure_fedora41_makefiles.cmake create mode 100644 .gitlab/ci/configure_fedora41_makefiles_clang.cmake create mode 100644 .gitlab/ci/configure_fedora41_makefiles_lfortran.cmake create mode 100644 .gitlab/ci/configure_fedora41_makefiles_symlinked.cmake create mode 100644 .gitlab/ci/configure_fedora41_ninja.cmake create mode 100644 .gitlab/ci/configure_fedora41_ninja_clang.cmake create mode 100644 .gitlab/ci/configure_fedora41_ninja_lfortran.cmake create mode 100644 .gitlab/ci/configure_fedora41_ninja_multi.cmake create mode 100644 .gitlab/ci/configure_fedora41_ninja_multi_clang.cmake create mode 100644 .gitlab/ci/configure_fedora41_sphinx.cmake create mode 100644 .gitlab/ci/configure_fedora41_sphinx_package.cmake create mode 100644 .gitlab/ci/configure_fedora41_tidy.cmake delete mode 100644 .gitlab/ci/ctest_memcheck_fedora40_asan.lsan.supp create mode 100644 .gitlab/ci/ctest_memcheck_fedora41_asan.lsan.supp delete mode 100644 .gitlab/ci/env_fedora40_asan.sh delete mode 100644 .gitlab/ci/env_fedora40_clang_analyzer.sh delete mode 100644 .gitlab/ci/env_fedora40_common_clang.sh delete mode 100644 .gitlab/ci/env_fedora40_common_lfortran.sh delete mode 100644 .gitlab/ci/env_fedora40_extdeps.sh delete mode 100644 .gitlab/ci/env_fedora40_makefiles.cmake delete mode 100644 .gitlab/ci/env_fedora40_makefiles.sh delete mode 100644 .gitlab/ci/env_fedora40_makefiles_clang.sh delete mode 100644 .gitlab/ci/env_fedora40_makefiles_lfortran.sh delete mode 100644 .gitlab/ci/env_fedora40_makefiles_symlinked.cmake delete mode 100644 .gitlab/ci/env_fedora40_makefiles_symlinked.sh delete mode 100644 .gitlab/ci/env_fedora40_ninja.sh delete mode 100644 .gitlab/ci/env_fedora40_ninja_clang.sh delete mode 100644 .gitlab/ci/env_fedora40_ninja_lfortran.sh delete mode 100644 .gitlab/ci/env_fedora40_ninja_multi.sh delete mode 100644 .gitlab/ci/env_fedora40_ninja_multi_clang.sh create mode 100644 .gitlab/ci/env_fedora41_asan.sh create mode 100644 .gitlab/ci/env_fedora41_clang_analyzer.sh create mode 100644 .gitlab/ci/env_fedora41_common_clang.sh create mode 100644 .gitlab/ci/env_fedora41_common_lfortran.sh create mode 100644 .gitlab/ci/env_fedora41_extdeps.sh create mode 100644 .gitlab/ci/env_fedora41_makefiles.cmake create mode 100644 .gitlab/ci/env_fedora41_makefiles.sh create mode 100644 .gitlab/ci/env_fedora41_makefiles_clang.sh create mode 100644 .gitlab/ci/env_fedora41_makefiles_lfortran.sh create mode 100644 .gitlab/ci/env_fedora41_makefiles_symlinked.cmake create mode 100644 .gitlab/ci/env_fedora41_makefiles_symlinked.sh create mode 100644 .gitlab/ci/env_fedora41_ninja.sh create mode 100644 .gitlab/ci/env_fedora41_ninja_clang.sh create mode 100644 .gitlab/ci/env_fedora41_ninja_lfortran.sh create mode 100644 .gitlab/ci/env_fedora41_ninja_multi.sh create mode 100644 .gitlab/ci/env_fedora41_ninja_multi_clang.sh delete mode 100644 .gitlab/ci/post_build_fedora40_tidy.sh create mode 100644 .gitlab/ci/post_build_fedora41_tidy.sh delete mode 100644 .gitlab/ci/pre_build_fedora40_tidy.sh create mode 100644 .gitlab/ci/pre_build_fedora41_tidy.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea90d80..65ba135 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ p:source-package: p:doc-package: extends: - - .fedora40_sphinx_package + - .fedora41_sphinx_package - .cmake_prep_doc_linux - .linux_x86_64_tags - .cmake_doc_artifacts @@ -108,18 +108,18 @@ l:iwyu-debian12: - .cmake_cdash_artifacts - .run_automatically -l:tidy-fedora40: +l:tidy-fedora41: extends: - - .fedora40_tidy + - .fedora41_tidy - .cmake_build_linux - .cmake_tidy_artifacts - .linux_x86_64_tags - .cmake_cdash_artifacts - .run_automatically -l:sphinx-fedora40: +l:sphinx-fedora41: extends: - - .fedora40_sphinx + - .fedora41_sphinx - .cmake_build_linux - .cmake_sphinx_artifacts - .linux_x86_64_tags @@ -128,9 +128,9 @@ l:sphinx-fedora40: CMAKE_CI_JOB_CONTINUOUS: "true" CMAKE_CI_JOB_HELP: "true" -l:clang-analyzer-fedora40: +l:clang-analyzer-fedora41: extends: - - .fedora40_clang_analyzer + - .fedora41_clang_analyzer - .cmake_build_linux - .linux_x86_64_tags - .run_automatically @@ -234,9 +234,9 @@ t:fedora39-hip-radeon: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora40-makefiles-lfortran: +t:fedora41-makefiles-lfortran: extends: - - .fedora40_makefiles_lfortran + - .fedora41_makefiles_lfortran - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -244,9 +244,9 @@ t:fedora40-makefiles-lfortran: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora40-ninja-lfortran: +t:fedora41-ninja-lfortran: extends: - - .fedora40_ninja_lfortran + - .fedora41_ninja_lfortran - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -254,9 +254,9 @@ t:fedora40-ninja-lfortran: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora40-ninja-clang: +t:fedora41-ninja-clang: extends: - - .fedora40_ninja_clang + - .fedora41_ninja_clang - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -264,9 +264,9 @@ t:fedora40-ninja-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora40-ninja-multi-clang: +t:fedora41-ninja-multi-clang: extends: - - .fedora40_ninja_multi_clang + - .fedora41_ninja_multi_clang - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -274,9 +274,9 @@ t:fedora40-ninja-multi-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora40-makefiles-clang: +t:fedora41-makefiles-clang: extends: - - .fedora40_makefiles_clang + - .fedora41_makefiles_clang - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -284,17 +284,17 @@ t:fedora40-makefiles-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora40-makefiles: +t:fedora41-makefiles: extends: - - .fedora40_makefiles + - .fedora41_makefiles - .cmake_test_linux_release - .linux_x86_64_v3_tags - .run_dependent - .needs_centos7_x86_64 -t:fedora40-makefiles-nospace: +t:fedora41-makefiles-nospace: extends: - - .fedora40_makefiles + - .fedora41_makefiles - .cmake_test_linux_release - .linux_x86_64_v3_tags - .cmake_junit_artifacts @@ -302,7 +302,7 @@ t:fedora40-makefiles-nospace: - .needs_centos7_x86_64 variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci" - CMAKE_CI_BUILD_NAME: fedora40_makefiles_nospace + CMAKE_CI_BUILD_NAME: fedora41_makefiles_nospace CMAKE_CI_JOB_NIGHTLY: "true" t:nvhpc22.11-ninja: @@ -448,9 +448,9 @@ t:debian10-legacy: variables: CMAKE_CI_JOB_NIGHTLY: "true" -b:fedora40-ninja: +b:fedora41-ninja: extends: - - .fedora40_ninja + - .fedora41_ninja - .cmake_build_linux - .cmake_build_artifacts - .linux_x86_64_tags @@ -458,9 +458,9 @@ b:fedora40-ninja: variables: CMAKE_CI_JOB_CONTINUOUS: "true" -b:fedora40-makefiles-symlinked: +b:fedora41-makefiles-symlinked: extends: - - .fedora40_makefiles_symlinked + - .fedora41_makefiles_symlinked - .cmake_build_linux - .cmake_build_artifacts - .linux_x86_64_tags @@ -495,54 +495,54 @@ b:debian12-aarch64-extdeps: variables: CMAKE_CI_JOB_NIGHTLY: "true" -b:fedora40-extdeps: +b:fedora41-extdeps: extends: - - .fedora40_extdeps + - .fedora41_extdeps - .cmake_build_linux_standalone - .linux_x86_64_tags - .run_manually variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora40-ninja: +t:fedora41-ninja: extends: - - .fedora40_ninja + - .fedora41_ninja - .cmake_test_linux - .linux_x86_64_tags_x11 - .cmake_test_artifacts - .run_dependent dependencies: - - b:fedora40-ninja + - b:fedora41-ninja needs: - - b:fedora40-ninja + - b:fedora41-ninja variables: CMAKE_CI_JOB_CONTINUOUS: "true" -t:fedora40-makefiles-symlinked: +t:fedora41-makefiles-symlinked: extends: - - .fedora40_makefiles_symlinked + - .fedora41_makefiles_symlinked - .cmake_test_linux - .linux_x86_64_tags_x11 - .cmake_test_artifacts - .run_dependent dependencies: - - b:fedora40-makefiles-symlinked + - b:fedora41-makefiles-symlinked needs: - - b:fedora40-makefiles-symlinked + - b:fedora41-makefiles-symlinked variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora40-ninja-multi: +t:fedora41-ninja-multi: extends: - - .fedora40_ninja_multi + - .fedora41_ninja_multi - .cmake_test_linux_external - .linux_x86_64_tags - .cmake_junit_artifacts - .run_dependent dependencies: - - t:fedora40-ninja + - t:fedora41-ninja needs: - - t:fedora40-ninja + - t:fedora41-ninja t:intel2016u2-makefiles: extends: @@ -797,9 +797,9 @@ u:linux-aarch64-package: ## Sanitizer builds -b:fedora40-asan: +b:fedora41-asan: extends: - - .fedora40_asan + - .fedora41_asan - .cmake_build_linux - .cmake_build_artifacts - .linux_x86_64_tags @@ -807,16 +807,16 @@ b:fedora40-asan: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora40-asan: +t:fedora41-asan: extends: - - .fedora40_asan + - .fedora41_asan - .cmake_memcheck_linux - .linux_x86_64_tags - .run_dependent dependencies: - - b:fedora40-asan + - b:fedora41-asan needs: - - b:fedora40-asan + - b:fedora41-asan variables: CMAKE_CI_JOB_NIGHTLY: "true" diff --git a/.gitlab/ci/configure_fedora40_asan.cmake b/.gitlab/ci/configure_fedora40_asan.cmake deleted file mode 100644 index ccdba4e..0000000 --- a/.gitlab/ci/configure_fedora40_asan.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(CMAKE_C_FLAGS "-fsanitize=address" CACHE STRING "") -set(CMAKE_CXX_FLAGS "-fsanitize=address" CACHE STRING "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common.cmake") diff --git a/.gitlab/ci/configure_fedora40_clang_analyzer.cmake b/.gitlab/ci/configure_fedora40_clang_analyzer.cmake deleted file mode 100644 index c210126..0000000 --- a/.gitlab/ci/configure_fedora40_clang_analyzer.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(configure_no_sccache 1) - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common.cmake") diff --git a/.gitlab/ci/configure_fedora40_common.cmake b/.gitlab/ci/configure_fedora40_common.cmake deleted file mode 100644 index 4484e26..0000000 --- a/.gitlab/ci/configure_fedora40_common.cmake +++ /dev/null @@ -1,7 +0,0 @@ -set(BUILD_CursesDialog ON CACHE BOOL "") -set(BUILD_QtDialog ON CACHE BOOL "") -set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "") -set(CMake_TEST_JQ "/usr/bin/jq" CACHE PATH "") -set(CMake_TEST_JSON_SCHEMA ON CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora40_common_clang.cmake b/.gitlab/ci/configure_fedora40_common_clang.cmake deleted file mode 100644 index a4ae3f3..0000000 --- a/.gitlab/ci/configure_fedora40_common_clang.cmake +++ /dev/null @@ -1,17 +0,0 @@ -set(CMAKE_Fortran_COMPILER "/usr/bin/flang-new" CACHE FILEPATH "") -set(CMAKE_Fortran_COMPILER_ID "LLVMFlang" CACHE STRING "") -set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 "1" CACHE BOOL "") - -set(CMake_TEST_C_STANDARDS "90;99;11;17;23" CACHE STRING "") -set(CMake_TEST_CXX_STANDARDS "98;11;14;17;20;23;26" CACHE STRING "") - -set(CMake_TEST_FindOpenACC "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenACC_C "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenACC_CXX "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenACC_Fortran "OFF" CACHE BOOL "") # flang-new fails producing LLVM IR -set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenMP_Fortran "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora40_common_lfortran.cmake b/.gitlab/ci/configure_fedora40_common_lfortran.cmake deleted file mode 100644 index 48469e2..0000000 --- a/.gitlab/ci/configure_fedora40_common_lfortran.cmake +++ /dev/null @@ -1,5 +0,0 @@ -set(CMAKE_Fortran_COMPILER "/usr/bin/lfortran" CACHE FILEPATH "") -set(CMAKE_Fortran_COMPILER_ID "LFortran" CACHE STRING "") -set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 "1" CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora40_extdeps.cmake b/.gitlab/ci/configure_fedora40_extdeps.cmake deleted file mode 100644 index 8e545f5..0000000 --- a/.gitlab/ci/configure_fedora40_extdeps.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_extdeps_common.cmake") diff --git a/.gitlab/ci/configure_fedora40_makefiles.cmake b/.gitlab/ci/configure_fedora40_makefiles.cmake deleted file mode 100644 index 30153cb..0000000 --- a/.gitlab/ci/configure_fedora40_makefiles.cmake +++ /dev/null @@ -1,117 +0,0 @@ -set(CMake_TEST_C_STANDARDS "90;99;11;17;23" CACHE STRING "") -set(CMake_TEST_CXX_STANDARDS "98;11;14;17;20;23;26" CACHE STRING "") - -set(CMake_TEST_CTestUpdate_BZR "ON" CACHE BOOL "") -set(CMake_TEST_CTestUpdate_GIT "ON" CACHE BOOL "") -set(CMake_TEST_CTestUpdate_HG "ON" CACHE BOOL "") -set(CMake_TEST_CTestUpdate_SVN "ON" CACHE BOOL "") -if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") - set(CMake_TEST_CTestUpdate_P4 "ON" CACHE BOOL "") -endif() - -set(CMake_TEST_ASM_NASM "ON" CACHE BOOL "") -set(CMake_TEST_FindALSA "ON" CACHE BOOL "") -set(CMake_TEST_FindBacktrace "ON" CACHE BOOL "") -set(CMake_TEST_FindBLAS "All;static=1;Generic" CACHE STRING "") -set(CMake_TEST_FindBoost "ON" CACHE BOOL "") -set(CMake_TEST_FindBoost_Python "ON" CACHE BOOL "") -set(CMake_TEST_FindBZip2 "ON" CACHE BOOL "") -set(CMake_TEST_FindCups "ON" CACHE BOOL "") -set(CMake_TEST_FindCURL "ON" CACHE BOOL "") -set(CMake_TEST_FindDevIL "ON" CACHE BOOL "") -set(CMake_TEST_FindDoxygen_Dot "ON" CACHE BOOL "") -set(CMake_TEST_FindDoxygen "ON" CACHE BOOL "") -set(CMake_TEST_FindEXPAT "ON" CACHE BOOL "") -set(CMake_TEST_FindFontconfig "ON" CACHE BOOL "") -set(CMake_TEST_FindFreetype "ON" CACHE BOOL "") -set(CMake_TEST_FindGDAL "ON" CACHE BOOL "") -set(CMake_TEST_FindGIF "ON" CACHE BOOL "") -set(CMake_TEST_FindGit "ON" CACHE BOOL "") -set(CMake_TEST_FindGLEW "ON" CACHE BOOL "") -set(CMake_TEST_FindGLUT "ON" CACHE BOOL "") -set(CMake_TEST_FindGnuTLS "ON" CACHE BOOL "") -set(CMake_TEST_FindGSL "ON" CACHE BOOL "") -set(CMake_TEST_FindGTest "ON" CACHE BOOL "") -set(CMake_TEST_FindGTK2 "ON" CACHE BOOL "") -set(CMake_TEST_FindHDF5 "ON" CACHE BOOL "") -set(CMake_TEST_FindHDF5_MPICH_C_COMPILER "/usr/lib64/mpich/bin/h5pcc" CACHE FILEPATH "") -# set(CMake_TEST_FindHDF5_MPICH_CXX_COMPILER "/usr/lib64/mpich/bin/h5pc++" CACHE FILEPATH "") # h5pc++ does not exist -set(CMake_TEST_FindHDF5_MPICH_ENVMOD "PATH=path_list_prepend:/usr/lib64/mpich/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/mpich/lib" CACHE STRING "") -set(CMake_TEST_FindHDF5_MPICH_Fortran_COMPILER "/usr/lib64/mpich/bin/h5pfc" CACHE FILEPATH "") -set(CMake_TEST_FindHDF5_OpenMPI_C_COMPILER "/usr/lib64/openmpi/bin/h5pcc" CACHE FILEPATH "") -set(CMake_TEST_FindHDF5_OpenMPI_ENVMOD "PATH=path_list_prepend:/usr/lib64/openmpi/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/openmpi/lib" CACHE STRING "") -# set(CMake_TEST_FindHDF5_OpenMPI_CXX_COMPILER "/usr/lib64/openmpi/bin/h5pc++" CACHE FILEPATH "") # h5pc++ does not exist -set(CMake_TEST_FindHDF5_OpenMPI_Fortran_COMPILER "/usr/lib64/openmpi/bin/h5pfc" CACHE FILEPATH "") -set(CMake_TEST_FindHDF5_Serial_C_COMPILER "/usr/bin/h5cc" CACHE FILEPATH "") -set(CMake_TEST_FindHDF5_Serial_CXX_COMPILER "/usr/bin/h5c++" CACHE FILEPATH "") -set(CMake_TEST_FindHDF5_Serial_Fortran_COMPILER "/usr/bin/h5fc" CACHE FILEPATH "") -set(CMake_TEST_FindIconv "ON" CACHE BOOL "") -set(CMake_TEST_FindICU "ON" CACHE BOOL "") -set(CMake_TEST_FindImageMagick "ON" CACHE BOOL "") -set(CMake_TEST_FindIntl "ON" CACHE BOOL "") -set(CMake_TEST_FindJasper "ON" CACHE BOOL "") -set(CMake_TEST_FindJNI "ON" CACHE BOOL "") -set(CMake_TEST_FindJPEG "ON" CACHE BOOL "") -set(CMake_TEST_FindJsonCpp "ON" CACHE BOOL "") -set(CMake_TEST_FindLAPACK "All;static=1;Generic" CACHE STRING "") -set(CMake_TEST_FindLibArchive "ON" CACHE BOOL "") -set(CMake_TEST_FindLibinput "ON" CACHE BOOL "") -set(CMake_TEST_FindLibLZMA "ON" CACHE BOOL "") -set(CMake_TEST_FindLibUV "ON" CACHE BOOL "") -set(CMake_TEST_FindLibXml2 "ON" CACHE BOOL "") -set(CMake_TEST_FindLibXslt "ON" CACHE BOOL "") -set(CMake_TEST_FindMPI_C "ON" CACHE BOOL "") -set(CMake_TEST_FindMPI_CXX "ON" CACHE BOOL "") -set(CMake_TEST_FindMPI_Fortran "ON" CACHE BOOL "") -set(CMake_TEST_FindMPI_ENVMOD "PATH=path_list_prepend:/usr/lib64/mpich/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/mpich/lib;FI_PROVIDER=set:tcp" CACHE STRING "") -set(CMake_TEST_FindMPI "ON" CACHE BOOL "") -set(CMake_TEST_FindODBC "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenACC "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenACC_C "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenACC_CXX "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenACC_Fortran "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenAL "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenGL "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenMP_Fortran "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenSP "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenSSL "ON" CACHE BOOL "") -set(CMake_TEST_FindPatch "ON" CACHE BOOL "") -set(CMake_TEST_FindPNG "ON" CACHE BOOL "") -set(CMake_TEST_FindPostgreSQL "ON" CACHE BOOL "") -set(CMake_TEST_FindProtobuf "ON" CACHE BOOL "") -set(CMake_TEST_FindProtobuf_gRPC "ON" CACHE BOOL "") -set(CMake_TEST_FindPython2 "ON" CACHE BOOL "") -set(CMake_TEST_FindPython3 "ON" CACHE BOOL "") -set(CMake_TEST_FindPython2_NumPy "ON" CACHE BOOL "") -set(CMake_TEST_FindPython3_NumPy "ON" CACHE BOOL "") -set(CMake_TEST_FindPython2_PyPy "ON" CACHE BOOL "") -set(CMake_TEST_FindPython3_PyPy "ON" CACHE BOOL "") -set(CMake_TEST_FindRuby "ON" CACHE BOOL "") -set(CMake_TEST_FindRuby_RVM "ON" CACHE BOOL "") -set(CMake_TEST_FindSDL "ON" CACHE BOOL "") -set(CMake_TEST_FindSQLite3 "ON" CACHE BOOL "") -set(CMake_TEST_FindTIFF "ON" CACHE BOOL "") -set(CMake_TEST_FindwxWidgets "ON" CACHE BOOL "") -set(CMake_TEST_FindX11 "ON" CACHE BOOL "") -set(CMake_TEST_FindXalanC "ON" CACHE BOOL "") -set(CMake_TEST_FindXercesC "ON" CACHE BOOL "") - -set(CMake_TEST_ELF_LARGE "ON" CACHE BOOL "") -set(CMake_TEST_Fortran_SUBMODULES "ON" CACHE BOOL "") -set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "") -set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "") -set(CMake_TEST_IPO_WORKS_Fortran "ON" CACHE BOOL "") -if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") - set(CMake_TEST_ISPC "ON" CACHE STRING "") -endif() -set(CMake_TEST_Qt5 "ON" CACHE BOOL "") -set(CMake_TEST_TLS_VERIFY_URL "https://gitlab.kitware.com" CACHE STRING "") -set(CMake_TEST_TLS_VERIFY_URL_BAD "https://badtls-expired.kitware.com" CACHE STRING "") -set(CMake_TEST_TLS_VERSION "1.3" CACHE STRING "") -set(CMake_TEST_TLS_VERSION_URL_BAD "https://badtls-v1-1.kitware.com:8011" CACHE STRING "") -set(CMake_TEST_UseSWIG "ON" CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora40_makefiles_clang.cmake b/.gitlab/ci/configure_fedora40_makefiles_clang.cmake deleted file mode 100644 index d5739c3..0000000 --- a/.gitlab/ci/configure_fedora40_makefiles_clang.cmake +++ /dev/null @@ -1,5 +0,0 @@ -if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") - set(CMAKE_TESTS_CDASH_SERVER "https://open.cdash.org" CACHE STRING "") -endif() - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora40_makefiles_lfortran.cmake b/.gitlab/ci/configure_fedora40_makefiles_lfortran.cmake deleted file mode 100644 index d626d4d..0000000 --- a/.gitlab/ci/configure_fedora40_makefiles_lfortran.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common_lfortran.cmake") diff --git a/.gitlab/ci/configure_fedora40_makefiles_symlinked.cmake b/.gitlab/ci/configure_fedora40_makefiles_symlinked.cmake deleted file mode 100644 index 6a677fd..0000000 --- a/.gitlab/ci/configure_fedora40_makefiles_symlinked.cmake +++ /dev/null @@ -1,2 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_symlinked_common.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common.cmake") diff --git a/.gitlab/ci/configure_fedora40_ninja.cmake b/.gitlab/ci/configure_fedora40_ninja.cmake deleted file mode 100644 index eea0228..0000000 --- a/.gitlab/ci/configure_fedora40_ninja.cmake +++ /dev/null @@ -1,18 +0,0 @@ -set(CMake_TEST_GUI "ON" CACHE BOOL "") -if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") - set(CMake_TEST_ISPC "ON" CACHE STRING "") -endif() -set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database" CACHE STRING "") -set(CMake_TEST_TLS_VERIFY_URL "https://gitlab.kitware.com" CACHE STRING "") -set(CMake_TEST_TLS_VERIFY_URL_BAD "https://badtls-expired.kitware.com" CACHE STRING "") -set(CMake_TEST_TLS_VERSION "1.3" CACHE STRING "") -set(CMake_TEST_TLS_VERSION_URL_BAD "https://badtls-v1-1.kitware.com:8011" CACHE STRING "") - -# "Release" flags without "-DNDEBUG" so we get assertions. -set(CMAKE_C_FLAGS_RELEASE "-O3" CACHE STRING "") -set(CMAKE_CXX_FLAGS_RELEASE "-O3" CACHE STRING "") - -# Cover compilation with C++11 only and not higher standards. -set(CMAKE_CXX_STANDARD "11" CACHE STRING "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common.cmake") diff --git a/.gitlab/ci/configure_fedora40_ninja_clang.cmake b/.gitlab/ci/configure_fedora40_ninja_clang.cmake deleted file mode 100644 index ee78d92..0000000 --- a/.gitlab/ci/configure_fedora40_ninja_clang.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database" CACHE STRING "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora40_ninja_lfortran.cmake b/.gitlab/ci/configure_fedora40_ninja_lfortran.cmake deleted file mode 100644 index d626d4d..0000000 --- a/.gitlab/ci/configure_fedora40_ninja_lfortran.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common_lfortran.cmake") diff --git a/.gitlab/ci/configure_fedora40_ninja_multi.cmake b/.gitlab/ci/configure_fedora40_ninja_multi.cmake deleted file mode 100644 index b4d9a70..0000000 --- a/.gitlab/ci/configure_fedora40_ninja_multi.cmake +++ /dev/null @@ -1,6 +0,0 @@ -if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") - set(CMake_TEST_ISPC "ON" CACHE STRING "") -endif() -set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database" CACHE STRING "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora40_ninja_multi_clang.cmake b/.gitlab/ci/configure_fedora40_ninja_multi_clang.cmake deleted file mode 100644 index ee78d92..0000000 --- a/.gitlab/ci/configure_fedora40_ninja_multi_clang.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database" CACHE STRING "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora40_sphinx.cmake b/.gitlab/ci/configure_fedora40_sphinx.cmake deleted file mode 100644 index 90d159b..0000000 --- a/.gitlab/ci/configure_fedora40_sphinx.cmake +++ /dev/null @@ -1,2 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_sphinx.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora40_sphinx_package.cmake b/.gitlab/ci/configure_fedora40_sphinx_package.cmake deleted file mode 100644 index e839de8..0000000 --- a/.gitlab/ci/configure_fedora40_sphinx_package.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Disable formats not wanted in the package's documentation. -set(SPHINX_INFO OFF CACHE BOOL "") -set(SPHINX_SINGLEHTML OFF CACHE BOOL "") -set(SPHINX_TEXT OFF CACHE BOOL "") - -# Set the destination directory for docs that packages expect. -set(CMAKE_DOC_DIR "doc/cmake" CACHE STRING "") - -# Use a custom prefix to avoid conflicting with other builds. -set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install-doc" CACHE PATH "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_sphinx.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora40_tidy.cmake b/.gitlab/ci/configure_fedora40_tidy.cmake deleted file mode 100644 index 037732c..0000000 --- a/.gitlab/ci/configure_fedora40_tidy.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "") -set(CMake_USE_CLANG_TIDY_MODULE ON CACHE BOOL "") -set(CMake_CLANG_TIDY_MODULE "$ENV{CI_PROJECT_DIR}/Utilities/ClangTidyModule/build/libcmake-clang-tidy-module.so" CACHE FILEPATH "") -set(CMake_CLANG_TIDY_EXPORT_FIXES_DIR "$ENV{CI_PROJECT_DIR}/.gitlab/clang-tidy-fixes" CACHE PATH "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common.cmake") diff --git a/.gitlab/ci/configure_fedora41_asan.cmake b/.gitlab/ci/configure_fedora41_asan.cmake new file mode 100644 index 0000000..df9f46d --- /dev/null +++ b/.gitlab/ci/configure_fedora41_asan.cmake @@ -0,0 +1,4 @@ +set(CMAKE_C_FLAGS "-fsanitize=address" CACHE STRING "") +set(CMAKE_CXX_FLAGS "-fsanitize=address" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake") diff --git a/.gitlab/ci/configure_fedora41_clang_analyzer.cmake b/.gitlab/ci/configure_fedora41_clang_analyzer.cmake new file mode 100644 index 0000000..cdeaab4 --- /dev/null +++ b/.gitlab/ci/configure_fedora41_clang_analyzer.cmake @@ -0,0 +1,3 @@ +set(configure_no_sccache 1) + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake") diff --git a/.gitlab/ci/configure_fedora41_common.cmake b/.gitlab/ci/configure_fedora41_common.cmake new file mode 100644 index 0000000..4484e26 --- /dev/null +++ b/.gitlab/ci/configure_fedora41_common.cmake @@ -0,0 +1,7 @@ +set(BUILD_CursesDialog ON CACHE BOOL "") +set(BUILD_QtDialog ON CACHE BOOL "") +set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "") +set(CMake_TEST_JQ "/usr/bin/jq" CACHE PATH "") +set(CMake_TEST_JSON_SCHEMA ON CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora41_common_clang.cmake b/.gitlab/ci/configure_fedora41_common_clang.cmake new file mode 100644 index 0000000..c115dc6 --- /dev/null +++ b/.gitlab/ci/configure_fedora41_common_clang.cmake @@ -0,0 +1,17 @@ +set(CMAKE_Fortran_COMPILER "/usr/bin/flang-new" CACHE FILEPATH "") +set(CMAKE_Fortran_COMPILER_ID "LLVMFlang" CACHE STRING "") +set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 "1" CACHE BOOL "") + +set(CMake_TEST_C_STANDARDS "90;99;11;17;23" CACHE STRING "") +set(CMake_TEST_CXX_STANDARDS "98;11;14;17;20;23;26" CACHE STRING "") + +set(CMake_TEST_FindOpenACC "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_C "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_CXX "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_Fortran "OFF" CACHE BOOL "") # flang-new fails producing LLVM IR +set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP_Fortran "OFF" CACHE BOOL "") # https://bugzilla.redhat.com/show_bug.cgi?id=2321571 +set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora41_common_lfortran.cmake b/.gitlab/ci/configure_fedora41_common_lfortran.cmake new file mode 100644 index 0000000..48469e2 --- /dev/null +++ b/.gitlab/ci/configure_fedora41_common_lfortran.cmake @@ -0,0 +1,5 @@ +set(CMAKE_Fortran_COMPILER "/usr/bin/lfortran" CACHE FILEPATH "") +set(CMAKE_Fortran_COMPILER_ID "LFortran" CACHE STRING "") +set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 "1" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora41_extdeps.cmake b/.gitlab/ci/configure_fedora41_extdeps.cmake new file mode 100644 index 0000000..8e545f5 --- /dev/null +++ b/.gitlab/ci/configure_fedora41_extdeps.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_extdeps_common.cmake") diff --git a/.gitlab/ci/configure_fedora41_makefiles.cmake b/.gitlab/ci/configure_fedora41_makefiles.cmake new file mode 100644 index 0000000..de57fde --- /dev/null +++ b/.gitlab/ci/configure_fedora41_makefiles.cmake @@ -0,0 +1,115 @@ +set(CMake_TEST_C_STANDARDS "90;99;11;17;23" CACHE STRING "") +set(CMake_TEST_CXX_STANDARDS "98;11;14;17;20;23;26" CACHE STRING "") + +set(CMake_TEST_CTestUpdate_BZR "ON" CACHE BOOL "") +set(CMake_TEST_CTestUpdate_GIT "ON" CACHE BOOL "") +set(CMake_TEST_CTestUpdate_HG "ON" CACHE BOOL "") +set(CMake_TEST_CTestUpdate_SVN "ON" CACHE BOOL "") +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_CTestUpdate_P4 "ON" CACHE BOOL "") +endif() + +set(CMake_TEST_ASM_NASM "ON" CACHE BOOL "") +set(CMake_TEST_FindALSA "ON" CACHE BOOL "") +set(CMake_TEST_FindBacktrace "ON" CACHE BOOL "") +set(CMake_TEST_FindBLAS "All;static=1;Generic" CACHE STRING "") +set(CMake_TEST_FindBoost "ON" CACHE BOOL "") +set(CMake_TEST_FindBoost_Python "ON" CACHE BOOL "") +set(CMake_TEST_FindBZip2 "ON" CACHE BOOL "") +set(CMake_TEST_FindCups "ON" CACHE BOOL "") +set(CMake_TEST_FindCURL "ON" CACHE BOOL "") +set(CMake_TEST_FindDevIL "ON" CACHE BOOL "") +set(CMake_TEST_FindDoxygen_Dot "ON" CACHE BOOL "") +set(CMake_TEST_FindDoxygen "ON" CACHE BOOL "") +set(CMake_TEST_FindEXPAT "ON" CACHE BOOL "") +set(CMake_TEST_FindFontconfig "ON" CACHE BOOL "") +set(CMake_TEST_FindFreetype "ON" CACHE BOOL "") +set(CMake_TEST_FindGDAL "ON" CACHE BOOL "") +set(CMake_TEST_FindGIF "ON" CACHE BOOL "") +set(CMake_TEST_FindGit "ON" CACHE BOOL "") +set(CMake_TEST_FindGLEW "ON" CACHE BOOL "") +set(CMake_TEST_FindGLUT "ON" CACHE BOOL "") +set(CMake_TEST_FindGnuTLS "ON" CACHE BOOL "") +set(CMake_TEST_FindGSL "ON" CACHE BOOL "") +set(CMake_TEST_FindGTest "ON" CACHE BOOL "") +set(CMake_TEST_FindGTK2 "ON" CACHE BOOL "") +set(CMake_TEST_FindHDF5 "ON" CACHE BOOL "") +set(CMake_TEST_FindHDF5_MPICH_C_COMPILER "/usr/lib64/mpich/bin/h5pcc" CACHE FILEPATH "") +# set(CMake_TEST_FindHDF5_MPICH_CXX_COMPILER "/usr/lib64/mpich/bin/h5pc++" CACHE FILEPATH "") # h5pc++ does not exist +set(CMake_TEST_FindHDF5_MPICH_ENVMOD "PATH=path_list_prepend:/usr/lib64/mpich/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/mpich/lib" CACHE STRING "") +set(CMake_TEST_FindHDF5_MPICH_Fortran_COMPILER "/usr/lib64/mpich/bin/h5pfc" CACHE FILEPATH "") +set(CMake_TEST_FindHDF5_OpenMPI_C_COMPILER "/usr/lib64/openmpi/bin/h5pcc" CACHE FILEPATH "") +set(CMake_TEST_FindHDF5_OpenMPI_ENVMOD "PATH=path_list_prepend:/usr/lib64/openmpi/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/openmpi/lib" CACHE STRING "") +# set(CMake_TEST_FindHDF5_OpenMPI_CXX_COMPILER "/usr/lib64/openmpi/bin/h5pc++" CACHE FILEPATH "") # h5pc++ does not exist +set(CMake_TEST_FindHDF5_OpenMPI_Fortran_COMPILER "/usr/lib64/openmpi/bin/h5pfc" CACHE FILEPATH "") +set(CMake_TEST_FindHDF5_Serial_C_COMPILER "/usr/bin/h5cc" CACHE FILEPATH "") +set(CMake_TEST_FindHDF5_Serial_CXX_COMPILER "/usr/bin/h5c++" CACHE FILEPATH "") +set(CMake_TEST_FindHDF5_Serial_Fortran_COMPILER "/usr/bin/h5fc" CACHE FILEPATH "") +set(CMake_TEST_FindIconv "ON" CACHE BOOL "") +set(CMake_TEST_FindICU "ON" CACHE BOOL "") +set(CMake_TEST_FindImageMagick "ON" CACHE BOOL "") +set(CMake_TEST_FindIntl "ON" CACHE BOOL "") +set(CMake_TEST_FindJasper "ON" CACHE BOOL "") +set(CMake_TEST_FindJNI "ON" CACHE BOOL "") +set(CMake_TEST_FindJPEG "ON" CACHE BOOL "") +set(CMake_TEST_FindJsonCpp "ON" CACHE BOOL "") +set(CMake_TEST_FindLAPACK "All;static=1;Generic" CACHE STRING "") +set(CMake_TEST_FindLibArchive "ON" CACHE BOOL "") +set(CMake_TEST_FindLibinput "ON" CACHE BOOL "") +set(CMake_TEST_FindLibLZMA "ON" CACHE BOOL "") +set(CMake_TEST_FindLibUV "ON" CACHE BOOL "") +set(CMake_TEST_FindLibXml2 "ON" CACHE BOOL "") +set(CMake_TEST_FindLibXslt "ON" CACHE BOOL "") +set(CMake_TEST_FindMPI_C "ON" CACHE BOOL "") +set(CMake_TEST_FindMPI_CXX "ON" CACHE BOOL "") +set(CMake_TEST_FindMPI_Fortran "ON" CACHE BOOL "") +set(CMake_TEST_FindMPI_ENVMOD "PATH=path_list_prepend:/usr/lib64/mpich/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/mpich/lib;FI_PROVIDER=set:tcp" CACHE STRING "") +set(CMake_TEST_FindMPI "ON" CACHE BOOL "") +set(CMake_TEST_FindODBC "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_C "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_CXX "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_Fortran "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenAL "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenGL "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP_Fortran "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenSP "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenSSL "ON" CACHE BOOL "") +set(CMake_TEST_FindPatch "ON" CACHE BOOL "") +set(CMake_TEST_FindPNG "ON" CACHE BOOL "") +set(CMake_TEST_FindPostgreSQL "ON" CACHE BOOL "") +set(CMake_TEST_FindProtobuf "ON" CACHE BOOL "") +set(CMake_TEST_FindProtobuf_gRPC "ON" CACHE BOOL "") +set(CMake_TEST_FindPython3 "ON" CACHE BOOL "") +set(CMake_TEST_FindPython3_NumPy "ON" CACHE BOOL "") +set(CMake_TEST_FindPython2_PyPy "ON" CACHE BOOL "") +set(CMake_TEST_FindPython3_PyPy "ON" CACHE BOOL "") +set(CMake_TEST_FindRuby "ON" CACHE BOOL "") +set(CMake_TEST_FindRuby_RVM "ON" CACHE BOOL "") +set(CMake_TEST_FindSDL "ON" CACHE BOOL "") +set(CMake_TEST_FindSQLite3 "ON" CACHE BOOL "") +set(CMake_TEST_FindTIFF "ON" CACHE BOOL "") +set(CMake_TEST_FindwxWidgets "ON" CACHE BOOL "") +set(CMake_TEST_FindX11 "ON" CACHE BOOL "") +set(CMake_TEST_FindXalanC "ON" CACHE BOOL "") +set(CMake_TEST_FindXercesC "ON" CACHE BOOL "") + +set(CMake_TEST_ELF_LARGE "ON" CACHE BOOL "") +set(CMake_TEST_Fortran_SUBMODULES "ON" CACHE BOOL "") +set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "") +set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "") +set(CMake_TEST_IPO_WORKS_Fortran "ON" CACHE BOOL "") +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() +set(CMake_TEST_Qt5 "ON" CACHE BOOL "") +set(CMake_TEST_TLS_VERIFY_URL "https://gitlab.kitware.com" CACHE STRING "") +set(CMake_TEST_TLS_VERIFY_URL_BAD "https://badtls-expired.kitware.com" CACHE STRING "") +set(CMake_TEST_TLS_VERSION "1.3" CACHE STRING "") +set(CMake_TEST_TLS_VERSION_URL_BAD "https://badtls-v1-1.kitware.com:8011" CACHE STRING "") +set(CMake_TEST_UseSWIG "ON" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora41_makefiles_clang.cmake b/.gitlab/ci/configure_fedora41_makefiles_clang.cmake new file mode 100644 index 0000000..3d6614e --- /dev/null +++ b/.gitlab/ci/configure_fedora41_makefiles_clang.cmake @@ -0,0 +1,5 @@ +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMAKE_TESTS_CDASH_SERVER "https://open.cdash.org" CACHE STRING "") +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora41_makefiles_lfortran.cmake b/.gitlab/ci/configure_fedora41_makefiles_lfortran.cmake new file mode 100644 index 0000000..951ce0d --- /dev/null +++ b/.gitlab/ci/configure_fedora41_makefiles_lfortran.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_lfortran.cmake") diff --git a/.gitlab/ci/configure_fedora41_makefiles_symlinked.cmake b/.gitlab/ci/configure_fedora41_makefiles_symlinked.cmake new file mode 100644 index 0000000..e4434c1 --- /dev/null +++ b/.gitlab/ci/configure_fedora41_makefiles_symlinked.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_symlinked_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake") diff --git a/.gitlab/ci/configure_fedora41_ninja.cmake b/.gitlab/ci/configure_fedora41_ninja.cmake new file mode 100644 index 0000000..217d24a --- /dev/null +++ b/.gitlab/ci/configure_fedora41_ninja.cmake @@ -0,0 +1,18 @@ +set(CMake_TEST_GUI "ON" CACHE BOOL "") +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() +set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database" CACHE STRING "") +set(CMake_TEST_TLS_VERIFY_URL "https://gitlab.kitware.com" CACHE STRING "") +set(CMake_TEST_TLS_VERIFY_URL_BAD "https://badtls-expired.kitware.com" CACHE STRING "") +set(CMake_TEST_TLS_VERSION "1.3" CACHE STRING "") +set(CMake_TEST_TLS_VERSION_URL_BAD "https://badtls-v1-1.kitware.com:8011" CACHE STRING "") + +# "Release" flags without "-DNDEBUG" so we get assertions. +set(CMAKE_C_FLAGS_RELEASE "-O3" CACHE STRING "") +set(CMAKE_CXX_FLAGS_RELEASE "-O3" CACHE STRING "") + +# Cover compilation with C++11 only and not higher standards. +set(CMAKE_CXX_STANDARD "11" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake") diff --git a/.gitlab/ci/configure_fedora41_ninja_clang.cmake b/.gitlab/ci/configure_fedora41_ninja_clang.cmake new file mode 100644 index 0000000..a6e7e2a --- /dev/null +++ b/.gitlab/ci/configure_fedora41_ninja_clang.cmake @@ -0,0 +1,3 @@ +set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora41_ninja_lfortran.cmake b/.gitlab/ci/configure_fedora41_ninja_lfortran.cmake new file mode 100644 index 0000000..951ce0d --- /dev/null +++ b/.gitlab/ci/configure_fedora41_ninja_lfortran.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_lfortran.cmake") diff --git a/.gitlab/ci/configure_fedora41_ninja_multi.cmake b/.gitlab/ci/configure_fedora41_ninja_multi.cmake new file mode 100644 index 0000000..b4d9a70 --- /dev/null +++ b/.gitlab/ci/configure_fedora41_ninja_multi.cmake @@ -0,0 +1,6 @@ +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() +set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora41_ninja_multi_clang.cmake b/.gitlab/ci/configure_fedora41_ninja_multi_clang.cmake new file mode 100644 index 0000000..a6e7e2a --- /dev/null +++ b/.gitlab/ci/configure_fedora41_ninja_multi_clang.cmake @@ -0,0 +1,3 @@ +set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora41_sphinx.cmake b/.gitlab/ci/configure_fedora41_sphinx.cmake new file mode 100644 index 0000000..90d159b --- /dev/null +++ b/.gitlab/ci/configure_fedora41_sphinx.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_sphinx.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora41_sphinx_package.cmake b/.gitlab/ci/configure_fedora41_sphinx_package.cmake new file mode 100644 index 0000000..e839de8 --- /dev/null +++ b/.gitlab/ci/configure_fedora41_sphinx_package.cmake @@ -0,0 +1,13 @@ +# Disable formats not wanted in the package's documentation. +set(SPHINX_INFO OFF CACHE BOOL "") +set(SPHINX_SINGLEHTML OFF CACHE BOOL "") +set(SPHINX_TEXT OFF CACHE BOOL "") + +# Set the destination directory for docs that packages expect. +set(CMAKE_DOC_DIR "doc/cmake" CACHE STRING "") + +# Use a custom prefix to avoid conflicting with other builds. +set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install-doc" CACHE PATH "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_sphinx.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora41_tidy.cmake b/.gitlab/ci/configure_fedora41_tidy.cmake new file mode 100644 index 0000000..40bde10 --- /dev/null +++ b/.gitlab/ci/configure_fedora41_tidy.cmake @@ -0,0 +1,6 @@ +set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "") +set(CMake_USE_CLANG_TIDY_MODULE ON CACHE BOOL "") +set(CMake_CLANG_TIDY_MODULE "$ENV{CI_PROJECT_DIR}/Utilities/ClangTidyModule/build/libcmake-clang-tidy-module.so" CACHE FILEPATH "") +set(CMake_CLANG_TIDY_EXPORT_FIXES_DIR "$ENV{CI_PROJECT_DIR}/.gitlab/clang-tidy-fixes" CACHE PATH "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake") diff --git a/.gitlab/ci/ctest_memcheck_fedora40_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora40_asan.lsan.supp deleted file mode 100644 index 8ec1a03..0000000 --- a/.gitlab/ci/ctest_memcheck_fedora40_asan.lsan.supp +++ /dev/null @@ -1 +0,0 @@ -# Add 'leak:' lines here to suppress known leaks. diff --git a/.gitlab/ci/ctest_memcheck_fedora41_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora41_asan.lsan.supp new file mode 100644 index 0000000..8ec1a03 --- /dev/null +++ b/.gitlab/ci/ctest_memcheck_fedora41_asan.lsan.supp @@ -0,0 +1 @@ +# Add 'leak:' lines here to suppress known leaks. diff --git a/.gitlab/ci/env_fedora40_asan.sh b/.gitlab/ci/env_fedora40_asan.sh deleted file mode 100644 index e976486..0000000 --- a/.gitlab/ci/env_fedora40_asan.sh +++ /dev/null @@ -1,2 +0,0 @@ -export CC=/usr/bin/clang -export CXX=/usr/bin/clang++ diff --git a/.gitlab/ci/env_fedora40_clang_analyzer.sh b/.gitlab/ci/env_fedora40_clang_analyzer.sh deleted file mode 100644 index d732c0b..0000000 --- a/.gitlab/ci/env_fedora40_clang_analyzer.sh +++ /dev/null @@ -1,2 +0,0 @@ -export CC=/usr/libexec/ccc-analyzer -export CXX=/usr/libexec/c++-analyzer diff --git a/.gitlab/ci/env_fedora40_common_clang.sh b/.gitlab/ci/env_fedora40_common_clang.sh deleted file mode 100644 index a3861d0..0000000 --- a/.gitlab/ci/env_fedora40_common_clang.sh +++ /dev/null @@ -1,3 +0,0 @@ -export CC=/usr/bin/clang-18 -export CXX=/usr/bin/clang++-18 -export FC=/usr/bin/flang-new diff --git a/.gitlab/ci/env_fedora40_common_lfortran.sh b/.gitlab/ci/env_fedora40_common_lfortran.sh deleted file mode 100644 index 499369c..0000000 --- a/.gitlab/ci/env_fedora40_common_lfortran.sh +++ /dev/null @@ -1 +0,0 @@ -export FC=/usr/bin/lfortran diff --git a/.gitlab/ci/env_fedora40_extdeps.sh b/.gitlab/ci/env_fedora40_extdeps.sh deleted file mode 100644 index 7076e18..0000000 --- a/.gitlab/ci/env_fedora40_extdeps.sh +++ /dev/null @@ -1 +0,0 @@ -source .gitlab/ci/env_extdeps_common.sh diff --git a/.gitlab/ci/env_fedora40_makefiles.cmake b/.gitlab/ci/env_fedora40_makefiles.cmake deleted file mode 100644 index ef13cda..0000000 --- a/.gitlab/ci/env_fedora40_makefiles.cmake +++ /dev/null @@ -1 +0,0 @@ -set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-3.0.4") diff --git a/.gitlab/ci/env_fedora40_makefiles.sh b/.gitlab/ci/env_fedora40_makefiles.sh deleted file mode 100644 index c482642..0000000 --- a/.gitlab/ci/env_fedora40_makefiles.sh +++ /dev/null @@ -1,8 +0,0 @@ -if test "$CMAKE_CI_NIGHTLY" = "true"; then - source .gitlab/ci/ispc-env.sh -fi - -# Patch HDF5 Fortran compiler wrappers to work around Fedora bug. -# https://bugzilla.redhat.com/show_bug.cgi?id=2183289 -sed -i '/^includedir=/ s|/mpich-x86_64||' /usr/lib64/mpich/bin/h5pfc -sed -i '/^includedir=/ s|/openmpi-x86_64||' /usr/lib64/openmpi/bin/h5pfc diff --git a/.gitlab/ci/env_fedora40_makefiles_clang.sh b/.gitlab/ci/env_fedora40_makefiles_clang.sh deleted file mode 100644 index 2021086..0000000 --- a/.gitlab/ci/env_fedora40_makefiles_clang.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora40_common_clang.sh diff --git a/.gitlab/ci/env_fedora40_makefiles_lfortran.sh b/.gitlab/ci/env_fedora40_makefiles_lfortran.sh deleted file mode 100644 index 15fbf3e..0000000 --- a/.gitlab/ci/env_fedora40_makefiles_lfortran.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora40_common_lfortran.sh diff --git a/.gitlab/ci/env_fedora40_makefiles_symlinked.cmake b/.gitlab/ci/env_fedora40_makefiles_symlinked.cmake deleted file mode 100644 index d381807..0000000 --- a/.gitlab/ci/env_fedora40_makefiles_symlinked.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/env_fedora40_makefiles.cmake") diff --git a/.gitlab/ci/env_fedora40_makefiles_symlinked.sh b/.gitlab/ci/env_fedora40_makefiles_symlinked.sh deleted file mode 100644 index 5a7584a..0000000 --- a/.gitlab/ci/env_fedora40_makefiles_symlinked.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora40_makefiles.sh diff --git a/.gitlab/ci/env_fedora40_ninja.sh b/.gitlab/ci/env_fedora40_ninja.sh deleted file mode 100644 index 217ff30..0000000 --- a/.gitlab/ci/env_fedora40_ninja.sh +++ /dev/null @@ -1,3 +0,0 @@ -if test "$CMAKE_CI_NIGHTLY" = "true"; then - source .gitlab/ci/ispc-env.sh -fi diff --git a/.gitlab/ci/env_fedora40_ninja_clang.sh b/.gitlab/ci/env_fedora40_ninja_clang.sh deleted file mode 100644 index 2021086..0000000 --- a/.gitlab/ci/env_fedora40_ninja_clang.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora40_common_clang.sh diff --git a/.gitlab/ci/env_fedora40_ninja_lfortran.sh b/.gitlab/ci/env_fedora40_ninja_lfortran.sh deleted file mode 100644 index 15fbf3e..0000000 --- a/.gitlab/ci/env_fedora40_ninja_lfortran.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora40_common_lfortran.sh diff --git a/.gitlab/ci/env_fedora40_ninja_multi.sh b/.gitlab/ci/env_fedora40_ninja_multi.sh deleted file mode 100644 index 217ff30..0000000 --- a/.gitlab/ci/env_fedora40_ninja_multi.sh +++ /dev/null @@ -1,3 +0,0 @@ -if test "$CMAKE_CI_NIGHTLY" = "true"; then - source .gitlab/ci/ispc-env.sh -fi diff --git a/.gitlab/ci/env_fedora40_ninja_multi_clang.sh b/.gitlab/ci/env_fedora40_ninja_multi_clang.sh deleted file mode 100644 index 2021086..0000000 --- a/.gitlab/ci/env_fedora40_ninja_multi_clang.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora40_common_clang.sh diff --git a/.gitlab/ci/env_fedora41_asan.sh b/.gitlab/ci/env_fedora41_asan.sh new file mode 100644 index 0000000..e976486 --- /dev/null +++ b/.gitlab/ci/env_fedora41_asan.sh @@ -0,0 +1,2 @@ +export CC=/usr/bin/clang +export CXX=/usr/bin/clang++ diff --git a/.gitlab/ci/env_fedora41_clang_analyzer.sh b/.gitlab/ci/env_fedora41_clang_analyzer.sh new file mode 100644 index 0000000..d732c0b --- /dev/null +++ b/.gitlab/ci/env_fedora41_clang_analyzer.sh @@ -0,0 +1,2 @@ +export CC=/usr/libexec/ccc-analyzer +export CXX=/usr/libexec/c++-analyzer diff --git a/.gitlab/ci/env_fedora41_common_clang.sh b/.gitlab/ci/env_fedora41_common_clang.sh new file mode 100644 index 0000000..02c8ca6 --- /dev/null +++ b/.gitlab/ci/env_fedora41_common_clang.sh @@ -0,0 +1,3 @@ +export CC=/usr/bin/clang-19 +export CXX=/usr/bin/clang++-19 +export FC=/usr/bin/flang-new diff --git a/.gitlab/ci/env_fedora41_common_lfortran.sh b/.gitlab/ci/env_fedora41_common_lfortran.sh new file mode 100644 index 0000000..499369c --- /dev/null +++ b/.gitlab/ci/env_fedora41_common_lfortran.sh @@ -0,0 +1 @@ +export FC=/usr/bin/lfortran diff --git a/.gitlab/ci/env_fedora41_extdeps.sh b/.gitlab/ci/env_fedora41_extdeps.sh new file mode 100644 index 0000000..7076e18 --- /dev/null +++ b/.gitlab/ci/env_fedora41_extdeps.sh @@ -0,0 +1 @@ +source .gitlab/ci/env_extdeps_common.sh diff --git a/.gitlab/ci/env_fedora41_makefiles.cmake b/.gitlab/ci/env_fedora41_makefiles.cmake new file mode 100644 index 0000000..ef13cda --- /dev/null +++ b/.gitlab/ci/env_fedora41_makefiles.cmake @@ -0,0 +1 @@ +set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-3.0.4") diff --git a/.gitlab/ci/env_fedora41_makefiles.sh b/.gitlab/ci/env_fedora41_makefiles.sh new file mode 100644 index 0000000..c482642 --- /dev/null +++ b/.gitlab/ci/env_fedora41_makefiles.sh @@ -0,0 +1,8 @@ +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/ispc-env.sh +fi + +# Patch HDF5 Fortran compiler wrappers to work around Fedora bug. +# https://bugzilla.redhat.com/show_bug.cgi?id=2183289 +sed -i '/^includedir=/ s|/mpich-x86_64||' /usr/lib64/mpich/bin/h5pfc +sed -i '/^includedir=/ s|/openmpi-x86_64||' /usr/lib64/openmpi/bin/h5pfc diff --git a/.gitlab/ci/env_fedora41_makefiles_clang.sh b/.gitlab/ci/env_fedora41_makefiles_clang.sh new file mode 100644 index 0000000..e2892e5 --- /dev/null +++ b/.gitlab/ci/env_fedora41_makefiles_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora41_common_clang.sh diff --git a/.gitlab/ci/env_fedora41_makefiles_lfortran.sh b/.gitlab/ci/env_fedora41_makefiles_lfortran.sh new file mode 100644 index 0000000..10e5623 --- /dev/null +++ b/.gitlab/ci/env_fedora41_makefiles_lfortran.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora41_common_lfortran.sh diff --git a/.gitlab/ci/env_fedora41_makefiles_symlinked.cmake b/.gitlab/ci/env_fedora41_makefiles_symlinked.cmake new file mode 100644 index 0000000..16937df --- /dev/null +++ b/.gitlab/ci/env_fedora41_makefiles_symlinked.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/env_fedora41_makefiles.cmake") diff --git a/.gitlab/ci/env_fedora41_makefiles_symlinked.sh b/.gitlab/ci/env_fedora41_makefiles_symlinked.sh new file mode 100644 index 0000000..7f84e9f --- /dev/null +++ b/.gitlab/ci/env_fedora41_makefiles_symlinked.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora41_makefiles.sh diff --git a/.gitlab/ci/env_fedora41_ninja.sh b/.gitlab/ci/env_fedora41_ninja.sh new file mode 100644 index 0000000..217ff30 --- /dev/null +++ b/.gitlab/ci/env_fedora41_ninja.sh @@ -0,0 +1,3 @@ +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/ispc-env.sh +fi diff --git a/.gitlab/ci/env_fedora41_ninja_clang.sh b/.gitlab/ci/env_fedora41_ninja_clang.sh new file mode 100644 index 0000000..e2892e5 --- /dev/null +++ b/.gitlab/ci/env_fedora41_ninja_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora41_common_clang.sh diff --git a/.gitlab/ci/env_fedora41_ninja_lfortran.sh b/.gitlab/ci/env_fedora41_ninja_lfortran.sh new file mode 100644 index 0000000..10e5623 --- /dev/null +++ b/.gitlab/ci/env_fedora41_ninja_lfortran.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora41_common_lfortran.sh diff --git a/.gitlab/ci/env_fedora41_ninja_multi.sh b/.gitlab/ci/env_fedora41_ninja_multi.sh new file mode 100644 index 0000000..217ff30 --- /dev/null +++ b/.gitlab/ci/env_fedora41_ninja_multi.sh @@ -0,0 +1,3 @@ +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/ispc-env.sh +fi diff --git a/.gitlab/ci/env_fedora41_ninja_multi_clang.sh b/.gitlab/ci/env_fedora41_ninja_multi_clang.sh new file mode 100644 index 0000000..e2892e5 --- /dev/null +++ b/.gitlab/ci/env_fedora41_ninja_multi_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora41_common_clang.sh diff --git a/.gitlab/ci/post_build_fedora40_tidy.sh b/.gitlab/ci/post_build_fedora40_tidy.sh deleted file mode 100644 index a36663a..0000000 --- a/.gitlab/ci/post_build_fedora40_tidy.sh +++ /dev/null @@ -1,21 +0,0 @@ -git config user.name "Kitware Robot" -git config user.email "kwrobot@kitware.com" - -clang-apply-replacements --style=file .gitlab/clang-tidy-fixes -git add . - -if [ -n "$(git status --porcelain)" ]; then - quietly git commit --file=- < - - -EOF - git format-patch --output=clang-tidy-fixes.patch -1 -N - echo "Patch from clang-tidy available, check artifacts of this CI job." >&2 -fi - -readonly num_warnings="$(cat .gitlab/num_warnings.txt)" -if [ "$num_warnings" -ne 0 ]; then - echo "Found $num_warnings warnings (treating as fatal)." >&2 - exit 1 -fi diff --git a/.gitlab/ci/post_build_fedora41_tidy.sh b/.gitlab/ci/post_build_fedora41_tidy.sh new file mode 100644 index 0000000..a36663a --- /dev/null +++ b/.gitlab/ci/post_build_fedora41_tidy.sh @@ -0,0 +1,21 @@ +git config user.name "Kitware Robot" +git config user.email "kwrobot@kitware.com" + +clang-apply-replacements --style=file .gitlab/clang-tidy-fixes +git add . + +if [ -n "$(git status --porcelain)" ]; then + quietly git commit --file=- < + + +EOF + git format-patch --output=clang-tidy-fixes.patch -1 -N + echo "Patch from clang-tidy available, check artifacts of this CI job." >&2 +fi + +readonly num_warnings="$(cat .gitlab/num_warnings.txt)" +if [ "$num_warnings" -ne 0 ]; then + echo "Found $num_warnings warnings (treating as fatal)." >&2 + exit 1 +fi diff --git a/.gitlab/ci/pre_build_fedora40_tidy.sh b/.gitlab/ci/pre_build_fedora40_tidy.sh deleted file mode 100644 index 7580ef1..0000000 --- a/.gitlab/ci/pre_build_fedora40_tidy.sh +++ /dev/null @@ -1,9 +0,0 @@ -cmake \ - -G Ninja \ - -S Utilities/ClangTidyModule \ - -B Utilities/ClangTidyModule/build \ - -DCMAKE_BUILD_TYPE=Release \ - -DRUN_TESTS=ON \ - -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -cmake --build Utilities/ClangTidyModule/build -ctest --test-dir Utilities/ClangTidyModule/build --output-on-failure diff --git a/.gitlab/ci/pre_build_fedora41_tidy.sh b/.gitlab/ci/pre_build_fedora41_tidy.sh new file mode 100644 index 0000000..7580ef1 --- /dev/null +++ b/.gitlab/ci/pre_build_fedora41_tidy.sh @@ -0,0 +1,9 @@ +cmake \ + -G Ninja \ + -S Utilities/ClangTidyModule \ + -B Utilities/ClangTidyModule/build \ + -DCMAKE_BUILD_TYPE=Release \ + -DRUN_TESTS=ON \ + -DCMAKE_CXX_COMPILER_LAUNCHER=sccache +cmake --build Utilities/ClangTidyModule/build +ctest --test-dir Utilities/ClangTidyModule/build --output-on-failure diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 95cd499..6f10510 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -5,7 +5,7 @@ ### Release .linux_prep_source: - image: "fedora:40" + image: "fedora:41" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -68,8 +68,8 @@ ### Fedora -.fedora40: - image: "kitware/cmake:ci-fedora40-x86_64-2024-07-23" +.fedora41: + image: "kitware/cmake:ci-fedora41-x86_64-2024-10-23" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" @@ -85,36 +85,36 @@ #### Lint builds -.fedora40_tidy: - extends: .fedora40 +.fedora41_tidy: + extends: .fedora41 variables: - CMAKE_CONFIGURATION: fedora40_tidy + CMAKE_CONFIGURATION: fedora41_tidy CMAKE_CI_NO_INSTALL: 1 -.fedora40_clang_analyzer: - extends: .fedora40 +.fedora41_clang_analyzer: + extends: .fedora41 variables: - CMAKE_CONFIGURATION: fedora40_clang_analyzer + CMAKE_CONFIGURATION: fedora41_clang_analyzer CMAKE_CI_BUILD_TYPE: Debug CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_CI_NO_INSTALL: 1 -.fedora40_sphinx: - extends: .fedora40 +.fedora41_sphinx: + extends: .fedora41 variables: - CMAKE_CONFIGURATION: fedora40_sphinx + CMAKE_CONFIGURATION: fedora41_sphinx CTEST_NO_WARNINGS_ALLOWED: 1 CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" CMAKE_CI_NO_INSTALL: 1 -.fedora40_sphinx_package: - extends: .fedora40 +.fedora41_sphinx_package: + extends: .fedora41 variables: - CMAKE_CONFIGURATION: fedora40_sphinx_package + CMAKE_CONFIGURATION: fedora41_sphinx_package CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" #### Build and test @@ -170,43 +170,43 @@ CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora40_extdeps: - extends: .fedora40 +.fedora41_extdeps: + extends: .fedora41 variables: - CMAKE_CONFIGURATION: fedora40_extdeps + CMAKE_CONFIGURATION: fedora41_extdeps CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora40_ninja: - extends: .fedora40 +.fedora41_ninja: + extends: .fedora41 variables: - CMAKE_CONFIGURATION: fedora40_ninja + CMAKE_CONFIGURATION: fedora41_ninja CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora40_ninja_multi: - extends: .fedora40 +.fedora41_ninja_multi: + extends: .fedora41 variables: - CMAKE_CONFIGURATION: fedora40_ninja_multi + CMAKE_CONFIGURATION: fedora41_ninja_multi CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Ninja Multi-Config" -.fedora40_makefiles: - extends: .fedora40 +.fedora41_makefiles: + extends: .fedora41 variables: - CMAKE_CONFIGURATION: fedora40_makefiles + CMAKE_CONFIGURATION: fedora41_makefiles CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" -.fedora40_makefiles_symlinked: - extends: .fedora40 +.fedora41_makefiles_symlinked: + extends: .fedora41 variables: - CMAKE_CONFIGURATION: fedora40_makefiles_symlinked + CMAKE_CONFIGURATION: fedora41_makefiles_symlinked CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" CMAKE_CI_IN_SYMLINK_TREE: 1 @@ -227,43 +227,43 @@ variables: CMAKE_CONFIGURATION: debian12_ninja_clang -.fedora40_makefiles_clang: - extends: .fedora40 +.fedora41_makefiles_clang: + extends: .fedora41 variables: - CMAKE_CONFIGURATION: fedora40_makefiles_clang + CMAKE_CONFIGURATION: fedora41_makefiles_clang CMAKE_GENERATOR: "Unix Makefiles" -.fedora40_makefiles_lfortran: - extends: .fedora40 +.fedora41_makefiles_lfortran: + extends: .fedora41 variables: # FIXME(lfortran): -rpath flags with spaces not forwarded GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci" - CMAKE_CONFIGURATION: fedora40_makefiles_lfortran + CMAKE_CONFIGURATION: fedora41_makefiles_lfortran CMAKE_GENERATOR: "Unix Makefiles" CTEST_LABELS: "Fortran" -.fedora40_ninja_lfortran: - extends: .fedora40 +.fedora41_ninja_lfortran: + extends: .fedora41 variables: # FIXME(lfortran): -rpath flags with spaces not forwarded GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci" - CMAKE_CONFIGURATION: fedora40_ninja_lfortran + CMAKE_CONFIGURATION: fedora41_ninja_lfortran CTEST_LABELS: "Fortran" -.fedora40_ninja_clang: - extends: .fedora40 +.fedora41_ninja_clang: + extends: .fedora41 variables: - CMAKE_CONFIGURATION: fedora40_ninja_clang + CMAKE_CONFIGURATION: fedora41_ninja_clang -.fedora40_ninja_multi_clang: - extends: .fedora40 +.fedora41_ninja_multi_clang: + extends: .fedora41 variables: - CMAKE_CONFIGURATION: fedora40_ninja_multi_clang + CMAKE_CONFIGURATION: fedora41_ninja_multi_clang CMAKE_GENERATOR: "Ninja Multi-Config" ### Sanitizers @@ -279,13 +279,13 @@ CTEST_MEMORYCHECK_TYPE: AddressSanitizer CTEST_MEMORYCHECK_SANITIZER_OPTIONS: "" -.fedora40_asan: +.fedora41_asan: extends: - - .fedora40 + - .fedora41 - .fedora_asan_addon variables: - CMAKE_CONFIGURATION: fedora40_asan + CMAKE_CONFIGURATION: fedora41_asan ### Intel Compiler @@ -555,7 +555,7 @@ .cmake_codespell_linux: stage: build - extends: .fedora40 + extends: .fedora41 script: - .gitlab/ci/codespell.sh interruptible: true @@ -698,7 +698,7 @@ .cmake_org_help: stage: build extends: - - .fedora40 + - .fedora41 - .linux_x86_64_tags - .cmake_org_help_artifacts script: diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml index 6b46313..ac177a9 100644 --- a/.gitlab/upload.yml +++ b/.gitlab/upload.yml @@ -1,7 +1,7 @@ # Steps for uploading artifacts .rsync_upload_package: - image: "fedora:40" + image: "fedora:41" stage: upload tags: - cmake @@ -21,7 +21,7 @@ .rsync_upload_help: stage: upload - image: "fedora:40" + image: "fedora:41" tags: - cmake - docker -- cgit v0.12 From 566b07bbf7b8cb81d4d8362e1ef3cd9b9a32bf75 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 Oct 2024 14:25:53 -0400 Subject: ci: Restore cmake.org html documentation search results for index entries Sphinx 7.3 fixes the problem motivating commit fbed0431c2 (ci: Suppress cmake.org html documentation search results for index entries, 2023-08-09, v3.27.2~2^2). Revert the workaround. Fixes: #25175 --- .gitlab/os-linux.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 6f10510..2f9a896 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -712,5 +712,3 @@ -DCMake_SPHINX_CMAKE_ORG_OUTDATED=$CMAKE_CI_SPHINX_OUTDATED -DCMake_VERSION_NO_GIT=$CMAKE_CI_VERSION_NO_GIT - ninja - # FIXME(#25175): non-main index entries are scored too high. - - sed -i '/search for explicit entries in index directives/,/^$/d' html/_static/searchtools.js -- cgit v0.12