From bc435bc2888d0a3ebb2adf9ec13786cb9bd72598 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Nov 2023 15:33:14 -0500 Subject: Tests: Update HIP.MathFunctions case for nodiscard enforcement --- Tests/HIP/MathFunctions/main.hip | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Tests/HIP/MathFunctions/main.hip b/Tests/HIP/MathFunctions/main.hip index 8a6e77f..dae89fc 100644 --- a/Tests/HIP/MathFunctions/main.hip +++ b/Tests/HIP/MathFunctions/main.hip @@ -18,11 +18,15 @@ bool verify(F f, T expected) { std::unique_ptr cpu_T(new T); T* gpu_T = nullptr; - hipMalloc((void**)&gpu_T, sizeof(T)); + if (hipMalloc((void**)&gpu_T, sizeof(T)) != hipSuccess) { + return false; + } + bool result = true; hipLaunchKernelGGL(global_entry_point, 1, 1, 0, 0, f, gpu_T); - hipMemcpy(cpu_T.get(), gpu_T, sizeof(T), hipMemcpyDeviceToHost); - hipFree(gpu_T); - return (*cpu_T == expected); + result = hipMemcpy(cpu_T.get(), gpu_T, sizeof(T), hipMemcpyDeviceToHost) == hipSuccess && result; + result = hipFree(gpu_T) == hipSuccess && result; + result = *cpu_T == expected && result; + return result; } } -- cgit v0.12 From 40552722c9865612bfef73da1053fe8a24193a66 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Nov 2023 10:51:01 -0500 Subject: Utilities/Sphinx: Fix python string literal syntax warning Python 3.12 started warning: conf.py:35: SyntaxWarning: invalid escape sequence '\.' Use a raw string literal instead. --- Utilities/Sphinx/conf.py.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in index b8d8474..f8651e1 100644 --- a/Utilities/Sphinx/conf.py.in +++ b/Utilities/Sphinx/conf.py.in @@ -32,7 +32,7 @@ nitpicky = True smartquotes = False cmake_manuals = sorted(glob.glob(r'@conf_docs@/manual/*.rst')) -cmake_manual_description = re.compile('^\.\. cmake-manual-description:(.*)$') +cmake_manual_description = re.compile(r'^\.\. cmake-manual-description:(.*)$') man_pages = [] for fpath in cmake_manuals: try: -- cgit v0.12 From 7517923418790e41b67a2908d1aec2b4ffe72314 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Nov 2023 10:22:56 -0500 Subject: codespell: Match valgrind output without repeating a spelling error --- Source/CTest/cmCTestMemCheckHandler.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index b51de84..b1afdc0 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -962,15 +962,15 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput( "== .*[0-9,]+ bytes in [0-9,]+ blocks are still reachable" " in loss record [0-9,]+ of [0-9,]+"); cmsys::RegularExpression vgUMC( - "== .*Conditional jump or move depends on uninitialised value\\(s\\)"); + "== .*Conditional jump or move depends on uninitiali[sz]ed value\\(s\\)"); cmsys::RegularExpression vgUMR1( - "== .*Use of uninitialised value of size [0-9,]+"); + "== .*Use of uninitiali[sz]ed value of size [0-9,]+"); cmsys::RegularExpression vgUMR2("== .*Invalid read of size [0-9,]+"); cmsys::RegularExpression vgUMR3("== .*Jump to the invalid address "); cmsys::RegularExpression vgUMR4( "== .*Syscall param .* contains " - "uninitialised or unaddressable byte\\(s\\)"); - cmsys::RegularExpression vgUMR5("== .*Syscall param .* uninitialised"); + "uninitiali[sz]ed or unaddressable byte\\(s\\)"); + cmsys::RegularExpression vgUMR5("== .*Syscall param .* uninitiali[sz]ed"); cmsys::RegularExpression vgIPW("== .*Invalid write of size [0-9,]+"); cmsys::RegularExpression vgABR("== .*pthread_mutex_unlock: mutex is " "locked by a different thread"); -- cgit v0.12 From f2776ac063e45fea91e4d496a910a0a6d10ed064 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Nov 2023 10:36:47 -0500 Subject: codespell: Revise release note about short-lived field to avoid misspelling --- Help/release/3.10.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Help/release/3.10.rst b/Help/release/3.10.rst index 117415b..03fce92 100644 --- a/Help/release/3.10.rst +++ b/Help/release/3.10.rst @@ -263,7 +263,7 @@ Changes made since CMake 3.10.0 include the following. 3.10.1 ------ -* The :manual:`cmake-server(7)` ``codemodel`` response ``crossReferences`` +* The :manual:`cmake-server(7)` ``codemodel`` response cross-references field added by 3.10.0 has been dropped due to excessive memory usage. Another approach will be needed to provide backtrace information. -- cgit v0.12 From 2744f14db1e87f4b7f6eb6f30f7c84ea52ce4a7a Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Nov 2023 10:37:49 -0500 Subject: codespell: Fix typos --- CMakeCPackOptions.cmake.in | 2 +- Help/command/cmake_language.rst | 2 +- Help/command/target_precompile_headers.rst | 2 +- Help/cpack_gen/freebsd.rst | 4 ++-- Help/dev/maint.rst | 2 +- Help/release/3.21.rst | 2 +- Help/variable/CMAKE_FIND_PACKAGE_REDIRECTS_DIR.rst | 2 +- Modules/CheckCCompilerFlag.cmake | 2 +- Modules/CheckCSourceCompiles.cmake | 2 +- Modules/CheckCSourceRuns.cmake | 2 +- Modules/CheckCXXSourceCompiles.cmake | 2 +- Modules/CheckCXXSourceRuns.cmake | 2 +- Modules/CheckCompilerFlag.cmake | 2 +- Modules/CheckFortranCompilerFlag.cmake | 2 +- Modules/CheckFortranSourceCompiles.cmake | 2 +- Modules/CheckFortranSourceRuns.cmake | 2 +- Modules/CheckOBJCCompilerFlag.cmake | 2 +- Modules/CheckOBJCSourceCompiles.cmake | 2 +- Modules/CheckOBJCSourceRuns.cmake | 2 +- Modules/CheckOBJCXXCompilerFlag.cmake | 2 +- Modules/CheckOBJCXXSourceCompiles.cmake | 2 +- Modules/CheckOBJCXXSourceRuns.cmake | 2 +- Modules/CheckSourceCompiles.cmake | 2 +- Modules/CheckSourceRuns.cmake | 2 +- Modules/Compiler/GNU-CXX-FeatureTests.cmake | 2 +- Modules/Compiler/LCC-CXX-FeatureTests.cmake | 2 +- Modules/ExternalProject.cmake | 4 ++-- Modules/FindCUDA.cmake | 2 +- Modules/FindEnvModules.cmake | 2 +- Modules/FindMPI.cmake | 2 +- Modules/FindSDL.cmake | 2 +- Modules/FindSDL_sound.cmake | 2 +- Modules/FindXCTest.cmake | 2 +- Modules/Internal/CPack/CPackFreeBSD.cmake | 2 +- Modules/UseJava.cmake | 2 +- Source/Modules/CMakeBuildUtilities.cmake | 4 ++-- Source/cmCPluginAPI.cxx | 4 ++-- Source/cmComputeLinkDepends.cxx | 4 ++-- Source/cmComputeLinkInformation.cxx | 2 +- Source/cmExtraCodeLiteGenerator.cxx | 2 +- Source/cmFileTimes.cxx | 2 +- Source/cmGeneratorTarget.cxx | 8 ++++---- Source/cmGlobalGenerator.cxx | 4 ++-- Source/cmMakefile.cxx | 2 +- Tests/CPackComponentsDEB/RunCPackVerifyResult.cmake | 2 +- Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake | 2 +- Tests/CTestUpdateCVS.cmake.in | 2 +- Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake | 2 +- Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake | 2 +- Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake | 2 +- .../RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake | 2 +- Tests/UseSWIG/ModuleVersion2/CMakeLists.txt | 4 ++-- Tests/UseSWIG/MultipleModules/CMakeLists.txt | 2 +- Tests/UseSWIG/MultiplePython/CMakeLists.txt | 2 +- 54 files changed, 64 insertions(+), 64 deletions(-) diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in index f354362..7aacf8e 100644 --- a/CMakeCPackOptions.cmake.in +++ b/CMakeCPackOptions.cmake.in @@ -5,7 +5,7 @@ if(CPACK_GENERATOR MATCHES "NSIS") set(CPACK_NSIS_INSTALL_ROOT "@CPACK_NSIS_INSTALL_ROOT@") - # set the install/unistall icon used for the installer itself + # set the install/uninstall icon used for the installer itself # There is a bug in NSI that does not handle full unix paths properly. set(CPACK_NSIS_MUI_ICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeLogo.ico") set(CPACK_NSIS_MUI_UNIICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeLogo.ico") diff --git a/Help/command/cmake_language.rst b/Help/command/cmake_language.rst index 707568c..3af6b9c 100644 --- a/Help/command/cmake_language.rst +++ b/Help/command/cmake_language.rst @@ -195,7 +195,7 @@ prints:: Immediate Message Deferred Message -The ``Cancelled Message`` is never printed because its command is +The ``Canceled Message`` is never printed because its command is canceled. The ``deferred_message`` variable reference is not evaluated until the call site, so it can be set after the deferred call is scheduled. diff --git a/Help/command/target_precompile_headers.rst b/Help/command/target_precompile_headers.rst index db55bc2..50eaf22 100644 --- a/Help/command/target_precompile_headers.rst +++ b/Help/command/target_precompile_headers.rst @@ -94,7 +94,7 @@ Reusing Precompile Headers ^^^^^^^^^^^^^^^^^^^^^^^^^^ The command also supports a second signature which can be used to specify that -one target re-uses a precompiled header file artifact from another target +one target reuses a precompiled header file artifact from another target instead of generating its own: .. code-block:: cmake diff --git a/Help/cpack_gen/freebsd.rst b/Help/cpack_gen/freebsd.rst index e97ba49..2a4a308 100644 --- a/Help/cpack_gen/freebsd.rst +++ b/Help/cpack_gen/freebsd.rst @@ -19,9 +19,9 @@ be used on FreeBSD, DragonflyBSD, NetBSD, OpenBSD, but also on Linux or OSX, depending on the installed package-management tools -- using :module:`CPack`. The CPack FreeBSD generator is a :module:`CPack` generator and uses the -:variable:`!CPACK_XXX` variables used by :module:`CPack`. It tries to re-use packaging +:variable:`!CPACK_XXX` variables used by :module:`CPack`. It tries to reuse packaging information that may already be specified for Debian packages for the -:cpack_gen:`CPack DEB Generator`. It also tries to re-use RPM packaging +:cpack_gen:`CPack DEB Generator`. It also tries to reuse RPM packaging information when Debian does not specify. The CPack FreeBSD generator should work on any host with libpkg installed. The diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst index de19aa8..81e0e6f 100644 --- a/Help/dev/maint.rst +++ b/Help/dev/maint.rst @@ -338,7 +338,7 @@ policies added for that version. Commit with a message such as:: export: Increase maximum policy version in exported files to $prev - The files generatd by `install(EXPORT)` and `export()` commands + The files generated by `install(EXPORT)` and `export()` commands are known to work with policies as of CMake $prev, so enable them in sufficiently new CMake versions. diff --git a/Help/release/3.21.rst b/Help/release/3.21.rst index 91c3768..8da1c94 100644 --- a/Help/release/3.21.rst +++ b/Help/release/3.21.rst @@ -318,7 +318,7 @@ Changes made since CMake 3.21.0 include the following. * The :generator:`Visual Studio 17 2022` generator is now based on "Visual Studio 2022 Preview 4". Previously it was based on "Preview 3.1". -* The AMD ROCm Platform ``hipcc`` compiler was identifed by CMake 3.21.0 +* The AMD ROCm Platform ``hipcc`` compiler was identified by CMake 3.21.0 through 3.21.2 as a distinct compiler with id ``ROCMClang``. This has been removed because it caused regressions. Instead: diff --git a/Help/variable/CMAKE_FIND_PACKAGE_REDIRECTS_DIR.rst b/Help/variable/CMAKE_FIND_PACKAGE_REDIRECTS_DIR.rst index b27a3d9..73bef87 100644 --- a/Help/variable/CMAKE_FIND_PACKAGE_REDIRECTS_DIR.rst +++ b/Help/variable/CMAKE_FIND_PACKAGE_REDIRECTS_DIR.rst @@ -12,7 +12,7 @@ The primary purpose of this variable is to facilitate integration between :command:`find_package` and :command:`FetchContent_MakeAvailable`. The latter command may create files in the ``CMAKE_FIND_PACKAGE_REDIRECTS_DIR`` directory when it populates a dependency. This allows subsequent calls to -:command:`find_package` for the same dependency to re-use the populated +:command:`find_package` for the same dependency to reuse the populated contents instead of trying to satisfy the dependency from somewhere external to the build. Projects may also want to write files into this directory in some situations (see :ref:`FetchContent-find_package-integration-examples` diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake index 12b0976..27b7ae8 100644 --- a/Modules/CheckCCompilerFlag.cmake +++ b/Modules/CheckCCompilerFlag.cmake @@ -22,7 +22,7 @@ issue a diagnostic message when given the flag. Whether the flag has any effect or even a specific one is beyond the scope of this module. The check is only performed once, with the result cached in the variable named -by ````. Every subsequent CMake run will re-use this cached value +by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckCSourceCompiles.cmake b/Modules/CheckCSourceCompiles.cmake index ce4719a..79aca93 100644 --- a/Modules/CheckCSourceCompiles.cmake +++ b/Modules/CheckCSourceCompiles.cmake @@ -23,7 +23,7 @@ Check if given C source compiles and links into an executable. expressions. The check is only performed once, with the result cached in the variable named - by ````. Every subsequent CMake run will re-use this cached value + by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckCSourceRuns.cmake b/Modules/CheckCSourceRuns.cmake index d5a8fda..e06bcca 100644 --- a/Modules/CheckCSourceRuns.cmake +++ b/Modules/CheckCSourceRuns.cmake @@ -22,7 +22,7 @@ subsequently be run. false (e.g. an empty string or an error message). The check is only performed once, with the result cached in the variable named - by ````. Every subsequent CMake run will re-use this cached value + by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckCXXSourceCompiles.cmake b/Modules/CheckCXXSourceCompiles.cmake index 4b33aa8..7531236 100644 --- a/Modules/CheckCXXSourceCompiles.cmake +++ b/Modules/CheckCXXSourceCompiles.cmake @@ -23,7 +23,7 @@ Check if given C++ source compiles and links into an executable. expressions. The check is only performed once, with the result cached in the variable named - by ````. Every subsequent CMake run will re-use this cached value + by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckCXXSourceRuns.cmake b/Modules/CheckCXXSourceRuns.cmake index 3402715..eb643eb 100644 --- a/Modules/CheckCXXSourceRuns.cmake +++ b/Modules/CheckCXXSourceRuns.cmake @@ -22,7 +22,7 @@ subsequently be run. false (e.g. an empty string or an error message). The check is only performed once, with the result cached in the variable named - by ````. Every subsequent CMake run will re-use this cached value + by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckCompilerFlag.cmake b/Modules/CheckCompilerFlag.cmake index a18435b..0f2ec4c 100644 --- a/Modules/CheckCompilerFlag.cmake +++ b/Modules/CheckCompilerFlag.cmake @@ -23,7 +23,7 @@ issue a diagnostic message when given the flag. Whether the flag has any effect or even a specific one is beyond the scope of this module. The check is only performed once, with the result cached in the variable named -by ````. Every subsequent CMake run will re-use this cached value +by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckFortranCompilerFlag.cmake b/Modules/CheckFortranCompilerFlag.cmake index 9164565..81a2345 100644 --- a/Modules/CheckFortranCompilerFlag.cmake +++ b/Modules/CheckFortranCompilerFlag.cmake @@ -24,7 +24,7 @@ issue a diagnostic message when given the flag. Whether the flag has any effect or even a specific one is beyond the scope of this module. The check is only performed once, with the result cached in the variable named -by ````. Every subsequent CMake run will re-use this cached value +by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckFortranSourceCompiles.cmake b/Modules/CheckFortranSourceCompiles.cmake index 5158b7e..ed374ef 100644 --- a/Modules/CheckFortranSourceCompiles.cmake +++ b/Modules/CheckFortranSourceCompiles.cmake @@ -48,7 +48,7 @@ Check if given Fortran source compiles and links into an executable. ``.F90`` is a typical choice. The check is only performed once, with the result cached in the variable named - by ````. Every subsequent CMake run will re-use this cached value + by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckFortranSourceRuns.cmake b/Modules/CheckFortranSourceRuns.cmake index f996749..9bf9fb2 100644 --- a/Modules/CheckFortranSourceRuns.cmake +++ b/Modules/CheckFortranSourceRuns.cmake @@ -44,7 +44,7 @@ subsequently be run. ``SRC_EXT`` option can be used to override this with ``.`` instead. The check is only performed once, with the result cached in the variable named - by ````. Every subsequent CMake run will re-use this cached value + by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckOBJCCompilerFlag.cmake b/Modules/CheckOBJCCompilerFlag.cmake index 24bf0db..f6d259e 100644 --- a/Modules/CheckOBJCCompilerFlag.cmake +++ b/Modules/CheckOBJCCompilerFlag.cmake @@ -24,7 +24,7 @@ issue a diagnostic message when given the flag. Whether the flag has any effect or even a specific one is beyond the scope of this module. The check is only performed once, with the result cached in the variable named -by ````. Every subsequent CMake run will re-use this cached value +by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckOBJCSourceCompiles.cmake b/Modules/CheckOBJCSourceCompiles.cmake index 7663054..bc0cac1 100644 --- a/Modules/CheckOBJCSourceCompiles.cmake +++ b/Modules/CheckOBJCSourceCompiles.cmake @@ -25,7 +25,7 @@ Check if given Objective-C source compiles and links into an executable. expressions. The check is only performed once, with the result cached in the variable named - by ````. Every subsequent CMake run will re-use this cached value + by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckOBJCSourceRuns.cmake b/Modules/CheckOBJCSourceRuns.cmake index a23a0c7..511cac6 100644 --- a/Modules/CheckOBJCSourceRuns.cmake +++ b/Modules/CheckOBJCSourceRuns.cmake @@ -24,7 +24,7 @@ subsequently be run. false (e.g. an empty string or an error message). The check is only performed once, with the result cached in the variable named - by ````. Every subsequent CMake run will re-use this cached value + by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckOBJCXXCompilerFlag.cmake b/Modules/CheckOBJCXXCompilerFlag.cmake index ae2d907..32d50c9 100644 --- a/Modules/CheckOBJCXXCompilerFlag.cmake +++ b/Modules/CheckOBJCXXCompilerFlag.cmake @@ -24,7 +24,7 @@ issue a diagnostic message when given the flag. Whether the flag has any effect or even a specific one is beyond the scope of this module. The check is only performed once, with the result cached in the variable named -by ````. Every subsequent CMake run will re-use this cached value +by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckOBJCXXSourceCompiles.cmake b/Modules/CheckOBJCXXSourceCompiles.cmake index cfbda3a..366d7d5 100644 --- a/Modules/CheckOBJCXXSourceCompiles.cmake +++ b/Modules/CheckOBJCXXSourceCompiles.cmake @@ -25,7 +25,7 @@ Check if given Objective-C++ source compiles and links into an executable. expressions. The check is only performed once, with the result cached in the variable named - by ````. Every subsequent CMake run will re-use this cached value + by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckOBJCXXSourceRuns.cmake b/Modules/CheckOBJCXXSourceRuns.cmake index b2831b6..49db3cb 100644 --- a/Modules/CheckOBJCXXSourceRuns.cmake +++ b/Modules/CheckOBJCXXSourceRuns.cmake @@ -24,7 +24,7 @@ subsequently be run. false (e.g. an empty string or an error message). The check is only performed once, with the result cached in the variable named - by ````. Every subsequent CMake run will re-use this cached value + by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckSourceCompiles.cmake b/Modules/CheckSourceCompiles.cmake index 041b59c..af905a4 100644 --- a/Modules/CheckSourceCompiles.cmake +++ b/Modules/CheckSourceCompiles.cmake @@ -48,7 +48,7 @@ Check if given source compiles and links into an executable. HAVE_ERROR_STOP) The check is only performed once, with the result cached in the variable - named by ````. Every subsequent CMake run will re-use this cached + named by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/CheckSourceRuns.cmake b/Modules/CheckSourceRuns.cmake index 822ee07..75636f4 100644 --- a/Modules/CheckSourceRuns.cmake +++ b/Modules/CheckSourceRuns.cmake @@ -48,7 +48,7 @@ subsequently be run. HAVE_COARRAY) The check is only performed once, with the result cached in the variable named - by ````. Every subsequent CMake run will re-use this cached value + by ````. Every subsequent CMake run will reuse this cached value rather than performing the check again, even if the ```` changes. In order to force the check to be re-evaluated, the variable named by ```` must be manually removed from the cache. diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/Modules/Compiler/GNU-CXX-FeatureTests.cmake index 45c5470..a9663d6 100644 --- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake +++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake @@ -54,7 +54,7 @@ set(_cmake_feature_test_cxx_user_literals "${GNU47_CXX11}") # NOTE: C++11 was ratified in September 2011. GNU 4.7 is the first minor # release following that (March 2012), and the first minor release to # support -std=c++11. Prior to that, support for C++11 features is technically -# experiemental and possibly incomplete (see for example the note below about +# experimental and possibly incomplete (see for example the note below about # cxx_variadic_template_template_parameters) # GNU does not define __cplusplus correctly before version 4.7. # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=1773 diff --git a/Modules/Compiler/LCC-CXX-FeatureTests.cmake b/Modules/Compiler/LCC-CXX-FeatureTests.cmake index 45c5470..a9663d6 100644 --- a/Modules/Compiler/LCC-CXX-FeatureTests.cmake +++ b/Modules/Compiler/LCC-CXX-FeatureTests.cmake @@ -54,7 +54,7 @@ set(_cmake_feature_test_cxx_user_literals "${GNU47_CXX11}") # NOTE: C++11 was ratified in September 2011. GNU 4.7 is the first minor # release following that (March 2012), and the first minor release to # support -std=c++11. Prior to that, support for C++11 features is technically -# experiemental and possibly incomplete (see for example the note below about +# experimental and possibly incomplete (see for example the note below about # cxx_variadic_template_template_parameters) # GNU does not define __cplusplus correctly before version 4.7. # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=1773 diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index f43f48d..3ec0557 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -522,7 +522,7 @@ overridden if required. use the same generator as the main project, but the ``CMAKE_GENERATOR`` option can be given to override this. The project is responsible for adding any toolchain details, flags or other settings it wants to - re-use from the main project or otherwise specify (see ``CMAKE_ARGS``, + reuse from the main project or otherwise specify (see ``CMAKE_ARGS``, ``CMAKE_CACHE_ARGS`` and ``CMAKE_CACHE_DEFAULT_ARGS`` below). For non-CMake external projects, the ``CONFIGURE_COMMAND`` option must @@ -593,7 +593,7 @@ overridden if required. as initial defaults only and will not override any variables already set from a previous run. Use this option with care, as it can lead to different behavior depending on whether the build starts from a fresh - build directory or re-uses previous build contents. + build directory or reuses previous build contents. .. versionadded:: 3.15 If the CMake generator is the ``Green Hills MULTI`` and not overridden, diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 0d7f1a4..203a473 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -1423,7 +1423,7 @@ function(CUDA_COMPUTE_BUILD_PATH path build_path) # Only deal with CMake style paths from here on out file(TO_CMAKE_PATH "${path}" bpath) if (IS_ABSOLUTE "${bpath}") - # Absolute paths are generally unnessary, especially if something like + # Absolute paths are generally unnecessary, especially if something like # file(GLOB_RECURSE) is used to pick up the files. string(FIND "${bpath}" "${CMAKE_CURRENT_BINARY_DIR}" _binary_dir_pos) diff --git a/Modules/FindEnvModules.cmake b/Modules/FindEnvModules.cmake index dab97ac..5337e4f 100644 --- a/Modules/FindEnvModules.cmake +++ b/Modules/FindEnvModules.cmake @@ -81,7 +81,7 @@ modules: .. command:: env_module - Execute an aribitrary module command: + Execute an arbitrary module command: .. code-block:: cmake diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index e3246c6..a25f113 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -436,7 +436,7 @@ function (_MPI_interrogate_compiler LANG) # a particular MPICH derivate might check compiler interoperability. # Intel MPI in particular does this with I_MPI_CHECK_COMPILER. file(TO_NATIVE_PATH "${CMAKE_${LANG}_COMPILER}" _MPI_UNDERLAYING_COMPILER) - # On Windows, the Intel MPI batch scripts can only work with filnames - Full paths will break them. + # On Windows, the Intel MPI batch scripts can only work with filenames - Full paths will break them. # Due to the lack of other MPICH-based wrappers for Visual C++, we may treat this as default. if(MSVC) get_filename_component(_MPI_UNDERLAYING_COMPILER "${_MPI_UNDERLAYING_COMPILER}" NAME) diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake index c68e18d..7691eb7 100644 --- a/Modules/FindSDL.cmake +++ b/Modules/FindSDL.cmake @@ -181,7 +181,7 @@ if(SDL_LIBRARY_TEMP) # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa. # CMake doesn't display the -framework Cocoa string in the UI even - # though it actually is there if I modify a pre-used variable. + # though it actually is there if I modify a preused variable. # I think it has something to do with the CACHE STRING. # So I use a temporary variable until the end so I can set the # "real" variable in one-shot. diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake index d863e3c..3443959 100644 --- a/Modules/FindSDL_sound.cmake +++ b/Modules/FindSDL_sound.cmake @@ -196,7 +196,7 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) # I expect that MPGLIB, VOC, WAV, AIFF, and SHN are compiled in statically. # I think Timidity is also compiled in statically. - # I've never had to explcitly link against Quicktime, so I'll skip that for now. + # I've never had to explicitly link against Quicktime, so I'll skip that for now. set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARY}) diff --git a/Modules/FindXCTest.cmake b/Modules/FindXCTest.cmake index 40e767b..a01c010 100644 --- a/Modules/FindXCTest.cmake +++ b/Modules/FindXCTest.cmake @@ -74,7 +74,7 @@ if(CMAKE_EFFECTIVE_SYSTEM_NAME STREQUAL "Apple" # platform directory which is not added to the CMAKE_FIND_ROOT_PATH # (only to CMAKE_SYSTEM_FRAMEWORK_PATH) and therefore not searched. # - # Until this is properly addressed, temporaily add the platform + # Until this is properly addressed, temporarily add the platform # directory to CMAKE_FIND_ROOT_PATH. list(APPEND CMAKE_FIND_ROOT_PATH "${_CMAKE_OSX_SYSROOT_PATH}/../..") endif() diff --git a/Modules/Internal/CPack/CPackFreeBSD.cmake b/Modules/Internal/CPack/CPackFreeBSD.cmake index c35089c..46a7bf7 100644 --- a/Modules/Internal/CPack/CPackFreeBSD.cmake +++ b/Modules/Internal/CPack/CPackFreeBSD.cmake @@ -66,7 +66,7 @@ _cpack_freebsd_fallback_var("CPACK_FREEBSD_PACKAGE_DESCRIPTION" ) # There's really only one homepage for a project, so -# re-use the Debian setting if it's there. +# reuse the Debian setting if it's there. _cpack_freebsd_fallback_var("CPACK_FREEBSD_PACKAGE_WWW" "CPACK_PACKAGE_HOMEPAGE_URL" "CPACK_DEBIAN_PACKAGE_HOMEPAGE" diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake index 99fd617..1724c3a 100644 --- a/Modules/UseJava.cmake +++ b/Modules/UseJava.cmake @@ -1521,7 +1521,7 @@ function (create_javah) "CLASSES;CLASSPATH;DEPENDS" ${ARGN}) - # ckeck parameters + # check parameters if (NOT _create_javah_TARGET AND NOT _create_javah_GENERATED_FILES) message (FATAL_ERROR "create_javah: TARGET or GENERATED_FILES must be specified.") endif() diff --git a/Source/Modules/CMakeBuildUtilities.cmake b/Source/Modules/CMakeBuildUtilities.cmake index c891fe9..21f04e6 100644 --- a/Source/Modules/CMakeBuildUtilities.cmake +++ b/Source/Modules/CMakeBuildUtilities.cmake @@ -4,7 +4,7 @@ # Originally it was a macro in the root `CMakeLists.txt` with the comment # "Simply to improve readability...". # However, as part of the modernization refactoring it was moved into a -# separate file cuz adding library alises wasn't possible inside the +# separate file cuz adding library aliases wasn't possible inside the # macro. #----------------------------------------------------------------------- @@ -170,7 +170,7 @@ else() CMAKE_SET_TARGET_FOLDER(cmcurl "Utilities/3rdParty") CMAKE_SET_TARGET_FOLDER(LIBCURL "Utilities/3rdParty") if(NOT CMAKE_USE_SYSTEM_NGHTTP2) - # Configure after curl to re-use some check results. + # Configure after curl to reuse some check results. add_subdirectory(Utilities/cmnghttp2) CMAKE_SET_TARGET_FOLDER(cmnghttp2 "Utilities/3rdParty") endif() diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx index 655f4bc..2e6cd40 100644 --- a/Source/cmCPluginAPI.cxx +++ b/Source/cmCPluginAPI.cxx @@ -549,7 +549,7 @@ static void CCONV* cmGetSource(void* arg, const char* name) sf->SourceExtension = cmSystemTools::GetFilenameLastExtension(sf->FullPath); - // Store the proxy in the map so it can be re-used and deleted later. + // Store the proxy in the map so it can be reused and deleted later. i = cmCPluginAPISourceFiles.emplace(rsf, std::move(sf)).first; } return i->second.get(); @@ -584,7 +584,7 @@ static void* CCONV cmAddSource(void* arg, void* arg2) sf->SourceName = osf->SourceName; sf->SourceExtension = osf->SourceExtension; - // Store the proxy in the map so it can be re-used and deleted later. + // Store the proxy in the map so it can be reused and deleted later. auto* value = sf.get(); cmCPluginAPISourceFiles[rsf] = std::move(sf); return value; diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index b5a8419..1b1f640 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -178,7 +178,7 @@ guaranteed to be acyclic. The final list of items produced by this procedure consists of the original user link line followed by minimal additional items needed to satisfy dependencies. The final list is then filtered to de-duplicate -items that we know the linker will re-use automatically (shared libs). +items that we know the linker will reuse automatically (shared libs). */ @@ -382,7 +382,7 @@ cmComputeLinkDepends::Compute() for (size_t i : cmReverseRange(this->FinalLinkOrder)) { LinkEntry const& e = this->EntryList[i]; cmGeneratorTarget const* t = e.Target; - // Entries that we know the linker will re-use do not need to be repeated. + // Entries that we know the linker will reuse do not need to be repeated. bool uniquify = t && t->GetType() == cmStateEnums::SHARED_LIBRARY; if (!uniquify || emitted.insert(i).second) { this->FinalLinkEntries.push_back(e); diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index f54f550..297ae1d 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -2591,7 +2591,7 @@ std::string cmComputeLinkInformation::GetRPathString(bool for_install) const // If the rpath will be replaced at install time, prepare space. if (!for_install && this->RuntimeUseChrpath) { if (!rpath.empty()) { - // Add one trailing separator so the linker does not re-use the + // Add one trailing separator so the linker does not reuse the // rpath .dynstr entry for a symbol name that happens to match // the end of the rpath string. rpath += this->GetRuntimeSep(); diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index 7538a7f..5d2b045 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -59,7 +59,7 @@ void cmExtraCodeLiteGenerator::Generate() this->GlobalGenerator->GetProjectMap(); // loop projects and locate the root project. - // and extract the information for creating the worspace + // and extract the information for creating the workspace // root makefile for (auto const& it : projectMap) { cmLocalGenerator* lg = it.second[0]; diff --git a/Source/cmFileTimes.cxx b/Source/cmFileTimes.cxx index bd896f5..0aaab1d 100644 --- a/Source/cmFileTimes.cxx +++ b/Source/cmFileTimes.cxx @@ -70,7 +70,7 @@ bool cmFileTimes::Load(std::string const& fileName) { std::unique_ptr ptr; if (this->IsValid()) { - // Invalidate this and re-use times + // Invalidate this and reuse times ptr.swap(this->times); } else { ptr = cm::make_unique(); diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index f224ec1..930922c 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -6946,7 +6946,7 @@ cmLinkInterface const* cmGeneratorTarget::GetLinkInterface( cmHeadToLinkInterfaceMap& hm = this->GetHeadToLinkInterfaceMap(config); // If the link interface does not depend on the head target - // then re-use the one from the head we computed first. + // then reuse the one from the head we computed first. if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) { head = hm.begin()->first; } @@ -7074,7 +7074,7 @@ const cmLinkInterfaceLibraries* cmGeneratorTarget::GetLinkInterfaceLibraries( : this->GetHeadToLinkInterfaceMap(config)); // If the link interface does not depend on the head target - // then re-use the one from the head we computed first. + // then reuse the one from the head we computed first. if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) { head = hm.begin()->first; } @@ -7596,7 +7596,7 @@ const cmLinkInterface* cmGeneratorTarget::GetImportLinkInterface( : this->GetHeadToLinkInterfaceMap(config)); // If the link interface does not depend on the head target - // then re-use the one from the head we computed first. + // then reuse the one from the head we computed first. if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) { headTarget = hm.begin()->first; } @@ -8156,7 +8156,7 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal( : this->GetHeadToLinkImplementationMap(config)); // If the link implementation does not depend on the head target - // then re-use the one from the head we computed first. + // then reuse the one from the head we computed first. if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) { head = hm.begin()->first; } diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 933e754..bec389f 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1865,7 +1865,7 @@ bool cmGlobalGenerator::AddAutomaticSources() } lg->AddUnityBuild(gt.get()); lg->AddISPCDependencies(gt.get()); - // Targets that re-use a PCH are handled below. + // Targets that reuse a PCH are handled below. if (!gt->GetProperty("PRECOMPILE_HEADERS_REUSE_FROM")) { lg->AddPchDependencies(gt.get()); } @@ -1877,7 +1877,7 @@ bool cmGlobalGenerator::AddAutomaticSources() if (!gt->CanCompileSources()) { continue; } - // Handle targets that re-use a PCH from an above-handled target. + // Handle targets that reuse a PCH from an above-handled target. if (gt->GetProperty("PRECOMPILE_HEADERS_REUSE_FROM")) { lg->AddPchDependencies(gt.get()); } diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 80f8a77..4a190db 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3721,7 +3721,7 @@ int cmMakefile::TryCompile(const std::string& srcdir, // make sure the same generator is used // use this program as the cmake to be run, it should not - // be run that way but the cmake object requires a vailid path + // be run that way but the cmake object requires a valid path cmake cm(cmake::RoleProject, cmState::Project, cmState::ProjectKind::TryCompile); auto gg = cm.CreateGlobalGenerator(this->GetGlobalGenerator()->GetName()); diff --git a/Tests/CPackComponentsDEB/RunCPackVerifyResult.cmake b/Tests/CPackComponentsDEB/RunCPackVerifyResult.cmake index b61e62d..64a8885 100644 --- a/Tests/CPackComponentsDEB/RunCPackVerifyResult.cmake +++ b/Tests/CPackComponentsDEB/RunCPackVerifyResult.cmake @@ -1,4 +1,4 @@ -# prevent older policies from interfearing with this script +# prevent older policies from interfering with this script cmake_policy(PUSH) cmake_policy(VERSION ${CMAKE_VERSION}) diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake index 260a0f8..07281ed 100644 --- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake +++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake @@ -1,4 +1,4 @@ -# prevent older policies from interfearing with this script +# prevent older policies from interfering with this script cmake_policy(PUSH) cmake_policy(VERSION ${CMAKE_VERSION}) diff --git a/Tests/CTestUpdateCVS.cmake.in b/Tests/CTestUpdateCVS.cmake.in index 8e0b611..d3263c3 100644 --- a/Tests/CTestUpdateCVS.cmake.in +++ b/Tests/CTestUpdateCVS.cmake.in @@ -17,7 +17,7 @@ message("Using CVS tools:") set(CVS "@CVS_EXECUTABLE@") message(" cvs = ${CVS}") -# Pre-pending :local: prevents cvs from trying to interpret Windows drive +# Prepending :local: prevents cvs from trying to interpret Windows drive # letters, like "C:", as host names. set(REPO ":local:${TOP}/repo") diff --git a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake index 6612375..c177447 100644 --- a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake +++ b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake @@ -12,7 +12,7 @@ endif() # clear the log file file(REMOVE "${LOG_FILE}.2343") -# create an example error from address santizer +# create an example error from address sanitizer file(APPEND "${LOG_FILE}.2343" "================================================================= diff --git a/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake index 4b5ef7e..9030009 100644 --- a/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake +++ b/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake @@ -12,7 +12,7 @@ endif() # clear the log file file(REMOVE "${LOG_FILE}.2343") -# create an error of each type of thread santizer +# create an error of each type of thread sanitizer # these names come from tsan_report.cc in llvm file(APPEND "${LOG_FILE}.2343" diff --git a/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake index 96251c3..29244b2 100644 --- a/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake +++ b/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake @@ -23,7 +23,7 @@ set(error_types # clear the log file file(REMOVE "${LOG_FILE}.2343") -# create an error of each type of thread santizer +# create an error of each type of thread sanitizer # these names come from tsan_report.cc in llvm foreach(error_type ${error_types} ) diff --git a/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake index 7160280..77481b1 100644 --- a/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake +++ b/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake @@ -12,7 +12,7 @@ endif() # clear the log file file(REMOVE "${LOG_FILE}.2343") -# create an error like undefined behavior santizer creates; +# create an error like undefined behavior sanitizer creates; # these names come from ubsan_diag.cc and ubsan_handlers.cc # in llvm diff --git a/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt b/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt index 317ed47..ded6b23 100644 --- a/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt +++ b/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt @@ -39,7 +39,7 @@ if(CMake_TEST_FindPython2) COMMAND "${CMAKE_COMMAND}" -E env "PYTHONPATH=$${PS}$" "${Python2_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/../runme.py") - # re-use sample interface file for another plugin + # reuse sample interface file for another plugin swig_add_library(example2 LANGUAGE python SOURCES ../example.i ../example.cxx) @@ -73,7 +73,7 @@ if(CMake_TEST_FindPython3) "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/../runme.py") - # re-use sample interface file for another plugin + # reuse sample interface file for another plugin swig_add_library(example4 LANGUAGE python SOURCES ../example.i ../example.cxx) diff --git a/Tests/UseSWIG/MultipleModules/CMakeLists.txt b/Tests/UseSWIG/MultipleModules/CMakeLists.txt index 4380080..4db28d7 100644 --- a/Tests/UseSWIG/MultipleModules/CMakeLists.txt +++ b/Tests/UseSWIG/MultipleModules/CMakeLists.txt @@ -38,7 +38,7 @@ set_target_properties (example1 PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Python") target_link_libraries(example1 PRIVATE Python::Module) -# re-use sample interface file for another plugin +# reuse sample interface file for another plugin set_property(SOURCE "../example.i" APPEND PROPERTY GENERATED_INCLUDE_DIRECTORIES ${PERL_INCLUDE_PATH}) separate_arguments(c_flags UNIX_COMMAND "${PERL_EXTRA_C_FLAGS}") diff --git a/Tests/UseSWIG/MultiplePython/CMakeLists.txt b/Tests/UseSWIG/MultiplePython/CMakeLists.txt index cf6c80e..0cb6f19 100644 --- a/Tests/UseSWIG/MultiplePython/CMakeLists.txt +++ b/Tests/UseSWIG/MultiplePython/CMakeLists.txt @@ -36,7 +36,7 @@ set_target_properties (example1 PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Python2") target_link_libraries(example1 PRIVATE Python2::Module) -# re-use sample interface file for another plugin +# reuse sample interface file for another plugin swig_add_library(example2 LANGUAGE python OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/Python3" -- cgit v0.12 From 2cf9a65835417dd917354267857d47131130eafc Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Nov 2023 13:16:07 -0500 Subject: clang-tidy: ignore warnings new in version 17 These warnings can be fixed in the future. Ignore them for now. --- .clang-tidy | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.clang-tidy b/.clang-tidy index 1b776e1..03e6a51 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -3,15 +3,18 @@ Checks: "-*,\ bugprone-*,\ -bugprone-assignment-in-if-condition,\ -bugprone-easily-swappable-parameters,\ +-bugprone-empty-catch,\ -bugprone-implicit-widening-of-multiplication-result,\ -bugprone-macro-parentheses,\ -bugprone-misplaced-widening-cast,\ -bugprone-narrowing-conversions,\ +-bugprone-switch-missing-default-case,\ -bugprone-too-small-loop-variable,\ -bugprone-unchecked-optional-access,\ misc-*,\ -misc-confusable-identifiers,\ -misc-const-correctness,\ +-misc-include-cleaner,\ -misc-no-recursion,\ -misc-non-private-member-variables-in-classes,\ -misc-static-assert,\ @@ -20,14 +23,18 @@ modernize-*,\ -modernize-avoid-c-arrays,\ -modernize-macro-to-enum,\ -modernize-return-braced-init-list,\ +-modernize-type-traits,\ -modernize-use-emplace,\ -modernize-use-nodiscard,\ -modernize-use-noexcept,\ -modernize-use-trailing-return-type,\ -modernize-use-transparent-functors,\ performance-*,\ +-performance-avoid-endl,\ -performance-inefficient-vector-operation,\ +-performance-noexcept-swap,\ readability-*,\ +-readability-avoid-unconditional-preprocessor-if,\ -readability-convert-member-functions-to-static,\ -readability-function-cognitive-complexity,\ -readability-function-size,\ @@ -41,6 +48,7 @@ readability-*,\ -readability-redundant-declaration,\ -readability-redundant-member-init,\ -readability-simplify-boolean-expr,\ +-readability-static-accessed-through-instance,\ -readability-suspicious-call-argument,\ -readability-uppercase-literal-suffix,\ cmake-*,\ -- cgit v0.12 From 653262162c8eb250106d062d99e040c4bea1b5a8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Nov 2023 11:34:00 -0500 Subject: clang-tidy module: Update to build against LLVM/Clang 17 --- Utilities/ClangTidyModule/Tests/RunClangTidy.cmake | 1 + .../cmake-ostringstream-use-cmstrcat-stdout.txt | 8 +- ...ke-string-concatenation-use-cmstrcat-stdout.txt | 158 ++++++++--------- .../Tests/cmake-use-bespoke-enum-class-stdout.txt | 24 +-- .../Tests/cmake-use-cmstrlen-stdout.txt | 64 +++---- .../Tests/cmake-use-cmsys-fstream-stdout.txt | 186 ++++++++++----------- .../Tests/cmake-use-pragma-once-stdout.txt | 51 ++++-- Utilities/ClangTidyModule/UsePragmaOnceCheck.h | 12 +- 8 files changed, 268 insertions(+), 236 deletions(-) diff --git a/Utilities/ClangTidyModule/Tests/RunClangTidy.cmake b/Utilities/ClangTidyModule/Tests/RunClangTidy.cmake index 98770d7..813d184 100644 --- a/Utilities/ClangTidyModule/Tests/RunClangTidy.cmake +++ b/Utilities/ClangTidyModule/Tests/RunClangTidy.cmake @@ -47,6 +47,7 @@ if(NOT result EQUAL 0) string(APPEND RunClangTidy_TEST_FAILED "Expected result: 0, actual result: ${result}\n") endif() +string(REGEX REPLACE " +\n" "\n" actual_stdout "${actual_stdout}") string(REGEX REPLACE "\n+$" "" actual_stdout "${actual_stdout}") if(NOT actual_stdout STREQUAL expect_stdout) string(REPLACE "\n" "\n " expect_stdout_formatted " ${expect_stdout}") diff --git a/Utilities/ClangTidyModule/Tests/cmake-ostringstream-use-cmstrcat-stdout.txt b/Utilities/ClangTidyModule/Tests/cmake-ostringstream-use-cmstrcat-stdout.txt index 1b2d6e7..9c4108c 100644 --- a/Utilities/ClangTidyModule/Tests/cmake-ostringstream-use-cmstrcat-stdout.txt +++ b/Utilities/ClangTidyModule/Tests/cmake-ostringstream-use-cmstrcat-stdout.txt @@ -1,6 +1,6 @@ cmake-ostringstream-use-cmstrcat.cxx:5:3: warning: use strings and cmStrCat() instead of std::ostringstream [cmake-ostringstream-use-cmstrcat] - std::ostringstream test; - ^ + 5 | std::ostringstream test; + | ^ cmake-ostringstream-use-cmstrcat.cxx:8:13: warning: use strings and cmStrCat() instead of std::ostringstream [cmake-ostringstream-use-cmstrcat] -void check2(std::ostringstream& test2) - ^ + 8 | void check2(std::ostringstream& test2) + | ^ diff --git a/Utilities/ClangTidyModule/Tests/cmake-string-concatenation-use-cmstrcat-stdout.txt b/Utilities/ClangTidyModule/Tests/cmake-string-concatenation-use-cmstrcat-stdout.txt index 83b8d83..749ad45 100644 --- a/Utilities/ClangTidyModule/Tests/cmake-string-concatenation-use-cmstrcat-stdout.txt +++ b/Utilities/ClangTidyModule/Tests/cmake-string-concatenation-use-cmstrcat-stdout.txt @@ -1,124 +1,124 @@ cmake-string-concatenation-use-cmstrcat.cxx:17:12: warning: use cmStrCat() instead of string concatenation [cmake-string-concatenation-use-cmstrcat] - concat = a + b; - ^ ~ - cmStrCat( , ) + 17 | concat = a + b; + | ^ ~ + | cmStrCat( , ) cmake-string-concatenation-use-cmstrcat.cxx:17:12: note: FIX-IT applied suggested code changes cmake-string-concatenation-use-cmstrcat.cxx:17:14: note: FIX-IT applied suggested code changes - concat = a + b; - ^ + 17 | concat = a + b; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:17:17: note: FIX-IT applied suggested code changes - concat = a + b; - ^ + 17 | concat = a + b; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:18:12: warning: use cmStrCat() instead of string concatenation [cmake-string-concatenation-use-cmstrcat] - concat = a + " and this is a string literal"; - ^ ~ - cmStrCat( , ) + 18 | concat = a + " and this is a string literal"; + | ^ ~ + | cmStrCat( , ) cmake-string-concatenation-use-cmstrcat.cxx:18:12: note: FIX-IT applied suggested code changes cmake-string-concatenation-use-cmstrcat.cxx:18:14: note: FIX-IT applied suggested code changes - concat = a + " and this is a string literal"; - ^ + 18 | concat = a + " and this is a string literal"; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:18:47: note: FIX-IT applied suggested code changes - concat = a + " and this is a string literal"; - ^ + 18 | concat = a + " and this is a string literal"; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:19:12: warning: use cmStrCat() instead of string concatenation [cmake-string-concatenation-use-cmstrcat] - concat = a + 'O'; - ^ ~ - cmStrCat( , ) + 19 | concat = a + 'O'; + | ^ ~ + | cmStrCat( , ) cmake-string-concatenation-use-cmstrcat.cxx:19:12: note: FIX-IT applied suggested code changes cmake-string-concatenation-use-cmstrcat.cxx:19:14: note: FIX-IT applied suggested code changes - concat = a + 'O'; - ^ + 19 | concat = a + 'O'; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:19:19: note: FIX-IT applied suggested code changes - concat = a + 'O'; - ^ + 19 | concat = a + 'O'; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:20:12: warning: use cmStrCat() instead of string concatenation [cmake-string-concatenation-use-cmstrcat] - concat = "This is a string literal" + b; - ^ ~ - cmStrCat( , ) + 20 | concat = "This is a string literal" + b; + | ^ ~ + | cmStrCat( , ) cmake-string-concatenation-use-cmstrcat.cxx:20:12: note: FIX-IT applied suggested code changes cmake-string-concatenation-use-cmstrcat.cxx:20:39: note: FIX-IT applied suggested code changes - concat = "This is a string literal" + b; - ^ + 20 | concat = "This is a string literal" + b; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:20:42: note: FIX-IT applied suggested code changes - concat = "This is a string literal" + b; - ^ + 20 | concat = "This is a string literal" + b; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:21:12: warning: use cmStrCat() instead of string concatenation [cmake-string-concatenation-use-cmstrcat] - concat = 'O' + a; - ^ ~ - cmStrCat( , ) + 21 | concat = 'O' + a; + | ^ ~ + | cmStrCat( , ) cmake-string-concatenation-use-cmstrcat.cxx:21:12: note: FIX-IT applied suggested code changes cmake-string-concatenation-use-cmstrcat.cxx:21:16: note: FIX-IT applied suggested code changes - concat = 'O' + a; - ^ + 21 | concat = 'O' + a; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:21:19: note: FIX-IT applied suggested code changes - concat = 'O' + a; - ^ + 21 | concat = 'O' + a; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:22:12: warning: use cmStrCat() instead of string concatenation [cmake-string-concatenation-use-cmstrcat] - concat = a + " and this is a string literal" + 'O' + b; - ^ ~ ~ ~ - cmStrCat( , , , ) + 22 | concat = a + " and this is a string literal" + 'O' + b; + | ^ ~ ~ ~ + | cmStrCat( , , , ) cmake-string-concatenation-use-cmstrcat.cxx:22:12: note: FIX-IT applied suggested code changes cmake-string-concatenation-use-cmstrcat.cxx:22:14: note: FIX-IT applied suggested code changes - concat = a + " and this is a string literal" + 'O' + b; - ^ + 22 | concat = a + " and this is a string literal" + 'O' + b; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:22:48: note: FIX-IT applied suggested code changes - concat = a + " and this is a string literal" + 'O' + b; - ^ + 22 | concat = a + " and this is a string literal" + 'O' + b; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:22:54: note: FIX-IT applied suggested code changes - concat = a + " and this is a string literal" + 'O' + b; - ^ + 22 | concat = a + " and this is a string literal" + 'O' + b; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:22:57: note: FIX-IT applied suggested code changes - concat = a + " and this is a string literal" + 'O' + b; - ^ + 22 | concat = a + " and this is a string literal" + 'O' + b; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:24:10: warning: use cmStrCat() instead of string append [cmake-string-concatenation-use-cmstrcat] - concat += b; - ^~ - = cmStrCat(concat, ) + 24 | concat += b; + | ^~ + | = cmStrCat(concat, ) cmake-string-concatenation-use-cmstrcat.cxx:24:10: note: FIX-IT applied suggested code changes cmake-string-concatenation-use-cmstrcat.cxx:24:14: note: FIX-IT applied suggested code changes - concat += b; - ^ + 24 | concat += b; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:25:10: warning: use cmStrCat() instead of string append [cmake-string-concatenation-use-cmstrcat] - concat += " and this is a string literal"; - ^~ - = cmStrCat(concat, ) + 25 | concat += " and this is a string literal"; + | ^~ + | = cmStrCat(concat, ) cmake-string-concatenation-use-cmstrcat.cxx:25:10: note: FIX-IT applied suggested code changes cmake-string-concatenation-use-cmstrcat.cxx:25:44: note: FIX-IT applied suggested code changes - concat += " and this is a string literal"; - ^ + 25 | concat += " and this is a string literal"; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:26:10: warning: use cmStrCat() instead of string append [cmake-string-concatenation-use-cmstrcat] - concat += 'o'; - ^~ - = cmStrCat(concat, ) + 26 | concat += 'o'; + | ^~ + | = cmStrCat(concat, ) cmake-string-concatenation-use-cmstrcat.cxx:26:10: note: FIX-IT applied suggested code changes cmake-string-concatenation-use-cmstrcat.cxx:26:16: note: FIX-IT applied suggested code changes - concat += 'o'; - ^ + 26 | concat += 'o'; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:27:10: warning: use cmStrCat() instead of string append [cmake-string-concatenation-use-cmstrcat] - concat += b + " and this is a string literal " + 'o' + b; - ^~ ~ ~ ~ - = cmStrCat(concat, , , , ) + 27 | concat += b + " and this is a string literal " + 'o' + b; + | ^~ ~ ~ ~ + | = cmStrCat(concat, , , , ) cmake-string-concatenation-use-cmstrcat.cxx:27:10: note: FIX-IT applied suggested code changes cmake-string-concatenation-use-cmstrcat.cxx:27:15: note: FIX-IT applied suggested code changes - concat += b + " and this is a string literal " + 'o' + b; - ^ + 27 | concat += b + " and this is a string literal " + 'o' + b; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:27:50: note: FIX-IT applied suggested code changes - concat += b + " and this is a string literal " + 'o' + b; - ^ + 27 | concat += b + " and this is a string literal " + 'o' + b; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:27:56: note: FIX-IT applied suggested code changes - concat += b + " and this is a string literal " + 'o' + b; - ^ + 27 | concat += b + " and this is a string literal " + 'o' + b; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:27:59: note: FIX-IT applied suggested code changes - concat += b + " and this is a string literal " + 'o' + b; - ^ + 27 | concat += b + " and this is a string literal " + 'o' + b; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:30:12: warning: use cmStrCat() instead of string concatenation [cmake-string-concatenation-use-cmstrcat] - concat = p.first + p.second; - ^ ~ - cmStrCat( , ) + 30 | concat = p.first + p.second; + | ^ ~ + | cmStrCat( , ) cmake-string-concatenation-use-cmstrcat.cxx:30:12: note: FIX-IT applied suggested code changes cmake-string-concatenation-use-cmstrcat.cxx:30:20: note: FIX-IT applied suggested code changes - concat = p.first + p.second; - ^ + 30 | concat = p.first + p.second; + | ^ cmake-string-concatenation-use-cmstrcat.cxx:30:30: note: FIX-IT applied suggested code changes - concat = p.first + p.second; - ^ + 30 | concat = p.first + p.second; + | ^ diff --git a/Utilities/ClangTidyModule/Tests/cmake-use-bespoke-enum-class-stdout.txt b/Utilities/ClangTidyModule/Tests/cmake-use-bespoke-enum-class-stdout.txt index 5e0acdd..cc72402 100644 --- a/Utilities/ClangTidyModule/Tests/cmake-use-bespoke-enum-class-stdout.txt +++ b/Utilities/ClangTidyModule/Tests/cmake-use-bespoke-enum-class-stdout.txt @@ -1,18 +1,18 @@ cmake-use-bespoke-enum-class.cxx:3:16: warning: use a bespoke enum class instead of booleans as parameters [cmake-use-bespoke-enum-class] -bool function1(bool i) - ^ + 3 | bool function1(bool i) + | ^ cmake-use-bespoke-enum-class.cxx:8:15: warning: use a bespoke enum class instead of booleans as parameters [cmake-use-bespoke-enum-class] -int function2(bool i) - ^ + 8 | int function2(bool i) + | ^ cmake-use-bespoke-enum-class.cxx:13:16: warning: use a bespoke enum class instead of booleans as parameters [cmake-use-bespoke-enum-class] -char function3(bool i) - ^ + 13 | char function3(bool i) + | ^ cmake-use-bespoke-enum-class.cxx:18:16: warning: use a bespoke enum class instead of booleans as parameters [cmake-use-bespoke-enum-class] -void function4(bool i) - ^ + 18 | void function4(bool i) + | ^ cmake-use-bespoke-enum-class.cxx:22:17: warning: use a bespoke enum class instead of booleans as parameters [cmake-use-bespoke-enum-class] -float function5(bool i) - ^ + 22 | float function5(bool i) + | ^ cmake-use-bespoke-enum-class.cxx:27:18: warning: use a bespoke enum class instead of booleans as parameters [cmake-use-bespoke-enum-class] -double function6(bool i) - ^ + 27 | double function6(bool i) + | ^ diff --git a/Utilities/ClangTidyModule/Tests/cmake-use-cmstrlen-stdout.txt b/Utilities/ClangTidyModule/Tests/cmake-use-cmstrlen-stdout.txt index d18822a..dada356 100644 --- a/Utilities/ClangTidyModule/Tests/cmake-use-cmstrlen-stdout.txt +++ b/Utilities/ClangTidyModule/Tests/cmake-use-cmstrlen-stdout.txt @@ -1,52 +1,52 @@ cmake-use-cmstrlen.cxx:26:9: warning: use cmStrLen() for string literals [cmake-use-cmstrlen] - (void)strlen("Hello"); - ^~~~~~ - cmStrLen + 26 | (void)strlen("Hello"); + | ^~~~~~ + | cmStrLen cmake-use-cmstrlen.cxx:26:9: note: FIX-IT applied suggested code changes cmake-use-cmstrlen.cxx:27:9: warning: use cmStrLen() for string literals [cmake-use-cmstrlen] - (void)::strlen("Goodbye"); - ^~~~~~~~ - cmStrLen + 27 | (void)::strlen("Goodbye"); + | ^~~~~~~~ + | cmStrLen cmake-use-cmstrlen.cxx:27:9: note: FIX-IT applied suggested code changes cmake-use-cmstrlen.cxx:28:9: warning: use cmStrLen() for string literals [cmake-use-cmstrlen] - (void)std::strlen("Hola"); - ^~~~~~~~~~~ - cmStrLen + 28 | (void)std::strlen("Hola"); + | ^~~~~~~~~~~ + | cmStrLen cmake-use-cmstrlen.cxx:28:9: note: FIX-IT applied suggested code changes cmake-use-cmstrlen.cxx:29:9: warning: use cmStrLen() for string literals [cmake-use-cmstrlen] - (void)ns1::strlen("Bonjour"); - ^~~~~~~~~~~ - cmStrLen + 29 | (void)ns1::strlen("Bonjour"); + | ^~~~~~~~~~~ + | cmStrLen cmake-use-cmstrlen.cxx:29:9: note: FIX-IT applied suggested code changes cmake-use-cmstrlen.cxx:30:10: warning: use cmStrLen() for string literals [cmake-use-cmstrlen] - (void)(sizeof("Hallo") - 1); - ^~~~~~ ~~~ - cmStrLen + 30 | (void)(sizeof("Hallo") - 1); + | ^~~~~~ ~~~ + | cmStrLen cmake-use-cmstrlen.cxx:30:10: note: FIX-IT applied suggested code changes cmake-use-cmstrlen.cxx:30:26: note: FIX-IT applied suggested code changes - (void)(sizeof("Hallo") - 1); - ^ + 30 | (void)(sizeof("Hallo") - 1); + | ^ cmake-use-cmstrlen.cxx:31:14: warning: use cmStrLen() for string literals [cmake-use-cmstrlen] - (void)(4 + sizeof("Hallo") - 1); - ^~~~~~ ~~~ - cmStrLen + 31 | (void)(4 + sizeof("Hallo") - 1); + | ^~~~~~ ~~~ + | cmStrLen cmake-use-cmstrlen.cxx:31:14: note: FIX-IT applied suggested code changes cmake-use-cmstrlen.cxx:31:30: note: FIX-IT applied suggested code changes - (void)(4 + sizeof("Hallo") - 1); - ^ + 31 | (void)(4 + sizeof("Hallo") - 1); + | ^ cmake-use-cmstrlen.cxx:32:10: warning: use cmStrLen() for string literals [cmake-use-cmstrlen] - (void)(sizeof "Hallo" - 1); - ^~~~~~ ~~~ - cmStrLen( ) + 32 | (void)(sizeof "Hallo" - 1); + | ^~~~~~ ~~~ + | cmStrLen( ) cmake-use-cmstrlen.cxx:32:10: note: FIX-IT applied suggested code changes cmake-use-cmstrlen.cxx:32:25: note: FIX-IT applied suggested code changes - (void)(sizeof "Hallo" - 1); - ^ + 32 | (void)(sizeof "Hallo" - 1); + | ^ cmake-use-cmstrlen.cxx:33:14: warning: use cmStrLen() for string literals [cmake-use-cmstrlen] - (void)(4 + sizeof "Hallo" - 1); - ^~~~~~ ~~~ - cmStrLen( ) + 33 | (void)(4 + sizeof "Hallo" - 1); + | ^~~~~~ ~~~ + | cmStrLen( ) cmake-use-cmstrlen.cxx:33:14: note: FIX-IT applied suggested code changes cmake-use-cmstrlen.cxx:33:29: note: FIX-IT applied suggested code changes - (void)(4 + sizeof "Hallo" - 1); - ^ + 33 | (void)(4 + sizeof "Hallo" - 1); + | ^ diff --git a/Utilities/ClangTidyModule/Tests/cmake-use-cmsys-fstream-stdout.txt b/Utilities/ClangTidyModule/Tests/cmake-use-cmsys-fstream-stdout.txt index d2c45f2..edf79bc 100644 --- a/Utilities/ClangTidyModule/Tests/cmake-use-cmsys-fstream-stdout.txt +++ b/Utilities/ClangTidyModule/Tests/cmake-use-cmsys-fstream-stdout.txt @@ -1,155 +1,155 @@ cmake-use-cmsys-fstream.cxx:24:20: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] - using ifstream = std::ifstream; - ^~~~~~~~~~~~~ - cmsys::ifstream + 24 | using ifstream = std::ifstream; + | ^~~~~~~~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:24:20: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:25:20: warning: use cmsys::ofstream [cmake-use-cmsys-fstream] - using ofstream = std::ofstream; - ^~~~~~~~~~~~~ - cmsys::ofstream + 25 | using ofstream = std::ofstream; + | ^~~~~~~~~~~~~ + | cmsys::ofstream cmake-use-cmsys-fstream.cxx:25:20: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:26:19: warning: use cmsys::fstream [cmake-use-cmsys-fstream] - using fstream = std::fstream; - ^~~~~~~~~~~~ - cmsys::fstream + 26 | using fstream = std::fstream; + | ^~~~~~~~~~~~ + | cmsys::fstream cmake-use-cmsys-fstream.cxx:26:19: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:29:13: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] -using ifs = std::ifstream; - ^~~~~~~~~~~~~ - cmsys::ifstream + 29 | using ifs = std::ifstream; + | ^~~~~~~~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:29:13: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:30:13: warning: use cmsys::ofstream [cmake-use-cmsys-fstream] -using ofs = std::ofstream; - ^~~~~~~~~~~~~ - cmsys::ofstream + 30 | using ofs = std::ofstream; + | ^~~~~~~~~~~~~ + | cmsys::ofstream cmake-use-cmsys-fstream.cxx:30:13: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:31:12: warning: use cmsys::fstream [cmake-use-cmsys-fstream] -using fs = std::fstream; - ^~~~~~~~~~~~ - cmsys::fstream + 31 | using fs = std::fstream; + | ^~~~~~~~~~~~ + | cmsys::fstream cmake-use-cmsys-fstream.cxx:31:12: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:41:3: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] - ifstream ifsUnqual; - ^~~~~~~~ - cmsys::ifstream + 41 | ifstream ifsUnqual; + | ^~~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:41:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:42:3: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] - std::ifstream ifsQual; - ^~~~~~~~~~~~~ - cmsys::ifstream + 42 | std::ifstream ifsQual; + | ^~~~~~~~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:42:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:43:3: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] - ns::ifstream ifsNS; - ^~~~~~~~~~~~ - cmsys::ifstream + 43 | ns::ifstream ifsNS; + | ^~~~~~~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:43:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:44:3: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] - ns::ns::ifstream ifsNested; - ^~~~~~~~~~~~~~~~ - cmsys::ifstream + 44 | ns::ns::ifstream ifsNested; + | ^~~~~~~~~~~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:44:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:45:3: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] - ns::cl::ifstream ifsClass; - ^~~~~~~~~~~~~~~~ - cmsys::ifstream + 45 | ns::cl::ifstream ifsClass; + | ^~~~~~~~~~~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:45:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:46:3: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] - ns::ifs ifsRenamed; - ^~~~~~~ - cmsys::ifstream + 46 | ns::ifs ifsRenamed; + | ^~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:46:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:48:3: warning: use cmsys::ofstream [cmake-use-cmsys-fstream] - ofstream ofsUnqual; - ^~~~~~~~ - cmsys::ofstream + 48 | ofstream ofsUnqual; + | ^~~~~~~~ + | cmsys::ofstream cmake-use-cmsys-fstream.cxx:48:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:49:3: warning: use cmsys::ofstream [cmake-use-cmsys-fstream] - std::ofstream ofsQual; - ^~~~~~~~~~~~~ - cmsys::ofstream + 49 | std::ofstream ofsQual; + | ^~~~~~~~~~~~~ + | cmsys::ofstream cmake-use-cmsys-fstream.cxx:49:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:50:3: warning: use cmsys::ofstream [cmake-use-cmsys-fstream] - ns::ofstream ofsNS; - ^~~~~~~~~~~~ - cmsys::ofstream + 50 | ns::ofstream ofsNS; + | ^~~~~~~~~~~~ + | cmsys::ofstream cmake-use-cmsys-fstream.cxx:50:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:51:3: warning: use cmsys::ofstream [cmake-use-cmsys-fstream] - ns::ns::ofstream ofsNested; - ^~~~~~~~~~~~~~~~ - cmsys::ofstream + 51 | ns::ns::ofstream ofsNested; + | ^~~~~~~~~~~~~~~~ + | cmsys::ofstream cmake-use-cmsys-fstream.cxx:51:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:52:3: warning: use cmsys::ofstream [cmake-use-cmsys-fstream] - ns::cl::ofstream ofsClass; - ^~~~~~~~~~~~~~~~ - cmsys::ofstream + 52 | ns::cl::ofstream ofsClass; + | ^~~~~~~~~~~~~~~~ + | cmsys::ofstream cmake-use-cmsys-fstream.cxx:52:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:53:3: warning: use cmsys::ofstream [cmake-use-cmsys-fstream] - ns::ofs ofsRenamed; - ^~~~~~~ - cmsys::ofstream + 53 | ns::ofs ofsRenamed; + | ^~~~~~~ + | cmsys::ofstream cmake-use-cmsys-fstream.cxx:53:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:55:3: warning: use cmsys::fstream [cmake-use-cmsys-fstream] - fstream fsUnqual; - ^~~~~~~ - cmsys::fstream + 55 | fstream fsUnqual; + | ^~~~~~~ + | cmsys::fstream cmake-use-cmsys-fstream.cxx:55:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:56:3: warning: use cmsys::fstream [cmake-use-cmsys-fstream] - std::fstream fsQual; - ^~~~~~~~~~~~ - cmsys::fstream + 56 | std::fstream fsQual; + | ^~~~~~~~~~~~ + | cmsys::fstream cmake-use-cmsys-fstream.cxx:56:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:57:3: warning: use cmsys::fstream [cmake-use-cmsys-fstream] - ns::fstream fsNS; - ^~~~~~~~~~~ - cmsys::fstream + 57 | ns::fstream fsNS; + | ^~~~~~~~~~~ + | cmsys::fstream cmake-use-cmsys-fstream.cxx:57:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:58:3: warning: use cmsys::fstream [cmake-use-cmsys-fstream] - ns::ns::fstream fsNested; - ^~~~~~~~~~~~~~~ - cmsys::fstream + 58 | ns::ns::fstream fsNested; + | ^~~~~~~~~~~~~~~ + | cmsys::fstream cmake-use-cmsys-fstream.cxx:58:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:59:3: warning: use cmsys::fstream [cmake-use-cmsys-fstream] - ns::ns::fstream fsClass; - ^~~~~~~~~~~~~~~ - cmsys::fstream + 59 | ns::ns::fstream fsClass; + | ^~~~~~~~~~~~~~~ + | cmsys::fstream cmake-use-cmsys-fstream.cxx:59:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:60:3: warning: use cmsys::fstream [cmake-use-cmsys-fstream] - ns::fs fsRenamed; - ^~~~~~ - cmsys::fstream + 60 | ns::fs fsRenamed; + | ^~~~~~ + | cmsys::fstream cmake-use-cmsys-fstream.cxx:60:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:62:3: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] - std::ifstream::off_type offsetQual = 0; - ^~~~~~~~~~~~~ - cmsys::ifstream + 62 | std::ifstream::off_type offsetQual = 0; + | ^~~~~~~~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:62:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:63:3: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] - ifstream::off_type offsetUnqual = 0; - ^~~~~~~~ - cmsys::ifstream + 63 | ifstream::off_type offsetUnqual = 0; + | ^~~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:63:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:64:3: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] - ns::ifstream::off_type offsetNS = 0; - ^~~~~~~~~~~~ - cmsys::ifstream + 64 | ns::ifstream::off_type offsetNS = 0; + | ^~~~~~~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:64:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:65:3: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] - ns::ns::ifstream::off_type offsetNested = 0; - ^~~~~~~~~~~~~~~~ - cmsys::ifstream + 65 | ns::ns::ifstream::off_type offsetNested = 0; + | ^~~~~~~~~~~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:65:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:66:3: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] - ns::ns::ifstream::traits_type::off_type offsetTraitsNested = 0; - ^~~~~~~~~~~~~~~~ - cmsys::ifstream + 66 | ns::ns::ifstream::traits_type::off_type offsetTraitsNested = 0; + | ^~~~~~~~~~~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:66:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:67:3: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] - ns::cl::ifstream::traits_type::off_type offsetTraitsClass = 0; - ^~~~~~~~~~~~~~~~ - cmsys::ifstream + 67 | ns::cl::ifstream::traits_type::off_type offsetTraitsClass = 0; + | ^~~~~~~~~~~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:67:3: note: FIX-IT applied suggested code changes cmake-use-cmsys-fstream.cxx:69:15: warning: use cmsys::ifstream [cmake-use-cmsys-fstream] - std::vector ifsVectorUnqual; - ^~~~~~~~ - cmsys::ifstream + 69 | std::vector ifsVectorUnqual; + | ^~~~~~~~ + | cmsys::ifstream cmake-use-cmsys-fstream.cxx:69:15: note: FIX-IT applied suggested code changes diff --git a/Utilities/ClangTidyModule/Tests/cmake-use-pragma-once-stdout.txt b/Utilities/ClangTidyModule/Tests/cmake-use-pragma-once-stdout.txt index e80e4a4..17c1345 100644 --- a/Utilities/ClangTidyModule/Tests/cmake-use-pragma-once-stdout.txt +++ b/Utilities/ClangTidyModule/Tests/cmake-use-pragma-once-stdout.txt @@ -1,25 +1,46 @@ cmake-use-pragma-once/cmake-use-pragma-once-both.h:1:1: warning: use #pragma once [cmake-use-pragma-once] -#ifndef BOTH_H -^~~~~~~~~~~~~~ + 1 | #ifndef BOTH_H + | ^~~~~~~~~~~~~~ + 2 | #define BOTH_H + | ~~~~~~~~~~~~~~ + 3 | #pragma once + 4 | + 5 | int both() + 6 | { + 7 | return 0; + 8 | } + 9 | + 10 | #endif + | ~~~~~~ cmake-use-pragma-once/cmake-use-pragma-once-both.h:1:1: note: FIX-IT applied suggested code changes cmake-use-pragma-once/cmake-use-pragma-once-both.h:2:1: note: FIX-IT applied suggested code changes -#define BOTH_H -^ + 2 | #define BOTH_H + | ^ cmake-use-pragma-once/cmake-use-pragma-once-both.h:10:1: note: FIX-IT applied suggested code changes -#endif -^ + 10 | #endif + | ^ cmake-use-pragma-once/cmake-use-pragma-once-include-guards.h:1:1: warning: use #pragma once [cmake-use-pragma-once] -#ifndef INCLUDE_GUARDS_H -^~~~~~~~~~~~~~~~~~~~~~~~ -#pragma once + 1 | #ifndef INCLUDE_GUARDS_H + | ^~~~~~~~~~~~~~~~~~~~~~~~ + | #pragma once + 2 | #define INCLUDE_GUARDS_H + | ~~~~~~~~~~~~~~~~~~~~~~~~ + 3 | + 4 | int includeGuards() + 5 | { + 6 | return 0; + 7 | } + 8 | + 9 | #endif + | ~~~~~~ cmake-use-pragma-once/cmake-use-pragma-once-include-guards.h:1:1: note: FIX-IT applied suggested code changes cmake-use-pragma-once/cmake-use-pragma-once-include-guards.h:2:1: note: FIX-IT applied suggested code changes -#define INCLUDE_GUARDS_H -^ + 2 | #define INCLUDE_GUARDS_H + | ^ cmake-use-pragma-once/cmake-use-pragma-once-include-guards.h:9:1: note: FIX-IT applied suggested code changes -#endif -^ + 9 | #endif + | ^ cmake-use-pragma-once/cmake-use-pragma-once-neither.h:1:1: warning: use #pragma once [cmake-use-pragma-once] -int neither() -^ + 1 | int neither() + | ^ cmake-use-pragma-once/cmake-use-pragma-once-neither.h:1:1: note: FIX-IT applied suggested code changes diff --git a/Utilities/ClangTidyModule/UsePragmaOnceCheck.h b/Utilities/ClangTidyModule/UsePragmaOnceCheck.h index 08c2099..325f643 100644 --- a/Utilities/ClangTidyModule/UsePragmaOnceCheck.h +++ b/Utilities/ClangTidyModule/UsePragmaOnceCheck.h @@ -18,6 +18,16 @@ #include #include +#if LLVM_VERSION_MAJOR >= 17 +# include +#else +namespace clang { +namespace tidy { +using utils::FileExtensionsSet; +} // namespace tidy +} // namespace clang +#endif + namespace clang { namespace tidy { namespace cmake { @@ -52,7 +62,7 @@ public: private: std::string RawStringHeaderFileExtensions; - utils::FileExtensionsSet HeaderFileExtensions; + FileExtensionsSet HeaderFileExtensions; }; } // namespace cmake -- cgit v0.12 From 57eadec6170e19e94b7b56f48a16eb82c4d9dcac Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Nov 2023 09:31:09 -0500 Subject: ci: update Linux image to Fedora 39 --- .gitlab/ci/docker/fedora38/Dockerfile | 58 ------------- .gitlab/ci/docker/fedora38/deps_packages.lst | 122 -------------------------- .gitlab/ci/docker/fedora38/install_deps.sh | 31 ------- .gitlab/ci/docker/fedora38/install_iwyu.sh | 42 --------- .gitlab/ci/docker/fedora38/install_rvm.sh | 25 ------ .gitlab/ci/docker/fedora38/iwyu_packages.lst | 7 -- .gitlab/ci/docker/fedora38/rvm_packages.lst | 18 ---- .gitlab/ci/docker/fedora39/Dockerfile | 58 +++++++++++++ .gitlab/ci/docker/fedora39/deps_packages.lst | 124 +++++++++++++++++++++++++++ .gitlab/ci/docker/fedora39/install_deps.sh | 31 +++++++ .gitlab/ci/docker/fedora39/install_iwyu.sh | 42 +++++++++ .gitlab/ci/docker/fedora39/install_rvm.sh | 25 ++++++ .gitlab/ci/docker/fedora39/iwyu_packages.lst | 7 ++ .gitlab/ci/docker/fedora39/rvm_packages.lst | 18 ++++ 14 files changed, 305 insertions(+), 303 deletions(-) delete mode 100644 .gitlab/ci/docker/fedora38/Dockerfile delete mode 100644 .gitlab/ci/docker/fedora38/deps_packages.lst delete mode 100755 .gitlab/ci/docker/fedora38/install_deps.sh delete mode 100755 .gitlab/ci/docker/fedora38/install_iwyu.sh delete mode 100755 .gitlab/ci/docker/fedora38/install_rvm.sh delete mode 100644 .gitlab/ci/docker/fedora38/iwyu_packages.lst delete mode 100644 .gitlab/ci/docker/fedora38/rvm_packages.lst create mode 100644 .gitlab/ci/docker/fedora39/Dockerfile create mode 100644 .gitlab/ci/docker/fedora39/deps_packages.lst create mode 100755 .gitlab/ci/docker/fedora39/install_deps.sh create mode 100755 .gitlab/ci/docker/fedora39/install_iwyu.sh create mode 100755 .gitlab/ci/docker/fedora39/install_rvm.sh create mode 100644 .gitlab/ci/docker/fedora39/iwyu_packages.lst create mode 100644 .gitlab/ci/docker/fedora39/rvm_packages.lst diff --git a/.gitlab/ci/docker/fedora38/Dockerfile b/.gitlab/ci/docker/fedora38/Dockerfile deleted file mode 100644 index 4918693..0000000 --- a/.gitlab/ci/docker/fedora38/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -# syntax=docker/dockerfile:1 - -ARG BASE_IMAGE=fedora:38 - -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/fedora38/deps_packages.lst b/.gitlab/ci/docker/fedora38/deps_packages.lst deleted file mode 100644 index da050d9..0000000 --- a/.gitlab/ci/docker/fedora38/deps_packages.lst +++ /dev/null @@ -1,122 +0,0 @@ -# Install build requirements. -ncurses-devel -openssl-devel -qt5-qtbase-devel -qt6-qtbase-devel - -# Install development tools. -clang -clang-tools-extra -clang-tools-extra-devel -compiler-rt -flang -flang-devel -gcc-c++ -git-core -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 -texinfo -qt5-qttools-devel -qt6-qttools-devel - -# Install lint tools. -clang-analyzer -codespell - -# Tools needed for the test suite. -findutils -file -jq -which - -# Install HIP language toolchain. -hsakmt-devel -lld -rocm-comgr-devel -rocm-hip-devel -rocm-runtime-devel - -# 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 -java-11-openjdk-devel -jsoncpp-devel -lapack-devel -libarchive-devel -libcurl-devel -libicu-devel -libinput-devel systemd-devel -libjpeg-turbo-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 diff --git a/.gitlab/ci/docker/fedora38/install_deps.sh b/.gitlab/ci/docker/fedora38/install_deps.sh deleted file mode 100755 index cd2701e..0000000 --- a/.gitlab/ci/docker/fedora38/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.11; 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.11/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/fedora38/install_iwyu.sh b/.gitlab/ci/docker/fedora38/install_iwyu.sh deleted file mode 100755 index 684e355..0000000 --- a/.gitlab/ci/docker/fedora38/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: Thu, 16 Nov 2023 09:34:02 -0500 Subject: ci: use Fedora 39 images and environments --- .gitlab-ci.yml | 88 +++++++++--------- .gitlab/ci/configure_fedora38_asan.cmake | 4 - .gitlab/ci/configure_fedora38_clang_analyzer.cmake | 3 - .gitlab/ci/configure_fedora38_common.cmake | 7 -- .gitlab/ci/configure_fedora38_common_clang.cmake | 6 -- .gitlab/ci/configure_fedora38_extdeps.cmake | 1 - .gitlab/ci/configure_fedora38_hip_radeon.cmake | 3 - .gitlab/ci/configure_fedora38_makefiles.cmake | 103 --------------------- .../ci/configure_fedora38_makefiles_clang.cmake | 5 - .../configure_fedora38_makefiles_symlinked.cmake | 2 - .gitlab/ci/configure_fedora38_ninja.cmake | 14 --- .gitlab/ci/configure_fedora38_ninja_clang.cmake | 4 - .gitlab/ci/configure_fedora38_ninja_multi.cmake | 5 - .../ci/configure_fedora38_ninja_multi_clang.cmake | 4 - .gitlab/ci/configure_fedora38_sphinx.cmake | 2 - .gitlab/ci/configure_fedora38_sphinx_package.cmake | 13 --- .gitlab/ci/configure_fedora38_tidy.cmake | 5 - .gitlab/ci/configure_fedora39_asan.cmake | 4 + .gitlab/ci/configure_fedora39_clang_analyzer.cmake | 3 + .gitlab/ci/configure_fedora39_common.cmake | 7 ++ .gitlab/ci/configure_fedora39_common_clang.cmake | 5 + .gitlab/ci/configure_fedora39_extdeps.cmake | 1 + .gitlab/ci/configure_fedora39_hip_radeon.cmake | 3 + .gitlab/ci/configure_fedora39_makefiles.cmake | 103 +++++++++++++++++++++ .../ci/configure_fedora39_makefiles_clang.cmake | 5 + .../configure_fedora39_makefiles_symlinked.cmake | 2 + .gitlab/ci/configure_fedora39_ninja.cmake | 14 +++ .gitlab/ci/configure_fedora39_ninja_clang.cmake | 4 + .gitlab/ci/configure_fedora39_ninja_multi.cmake | 5 + .../ci/configure_fedora39_ninja_multi_clang.cmake | 4 + .gitlab/ci/configure_fedora39_sphinx.cmake | 2 + .gitlab/ci/configure_fedora39_sphinx_package.cmake | 13 +++ .gitlab/ci/configure_fedora39_tidy.cmake | 5 + .gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp | 1 - .gitlab/ci/ctest_memcheck_fedora39_asan.lsan.supp | 1 + .gitlab/ci/env_fedora38_asan.sh | 2 - .gitlab/ci/env_fedora38_clang_analyzer.sh | 2 - .gitlab/ci/env_fedora38_common_clang.sh | 4 - .gitlab/ci/env_fedora38_extdeps.sh | 1 - .gitlab/ci/env_fedora38_hip_radeon.sh | 1 - .gitlab/ci/env_fedora38_makefiles.cmake | 1 - .gitlab/ci/env_fedora38_makefiles.sh | 8 -- .gitlab/ci/env_fedora38_makefiles_clang.sh | 1 - .gitlab/ci/env_fedora38_makefiles_symlinked.cmake | 1 - .gitlab/ci/env_fedora38_makefiles_symlinked.sh | 1 - .gitlab/ci/env_fedora38_ninja.sh | 3 - .gitlab/ci/env_fedora38_ninja_clang.sh | 1 - .gitlab/ci/env_fedora38_ninja_multi.sh | 3 - .gitlab/ci/env_fedora38_ninja_multi_clang.sh | 1 - .gitlab/ci/env_fedora39_asan.sh | 2 + .gitlab/ci/env_fedora39_clang_analyzer.sh | 2 + .gitlab/ci/env_fedora39_common_clang.sh | 3 + .gitlab/ci/env_fedora39_extdeps.sh | 1 + .gitlab/ci/env_fedora39_hip_radeon.sh | 1 + .gitlab/ci/env_fedora39_makefiles.cmake | 1 + .gitlab/ci/env_fedora39_makefiles.sh | 8 ++ .gitlab/ci/env_fedora39_makefiles_clang.sh | 1 + .gitlab/ci/env_fedora39_makefiles_symlinked.cmake | 1 + .gitlab/ci/env_fedora39_makefiles_symlinked.sh | 1 + .gitlab/ci/env_fedora39_ninja.sh | 3 + .gitlab/ci/env_fedora39_ninja_clang.sh | 1 + .gitlab/ci/env_fedora39_ninja_multi.sh | 3 + .gitlab/ci/env_fedora39_ninja_multi_clang.sh | 1 + .gitlab/ci/pre_build_fedora38_tidy.sh | 9 -- .gitlab/ci/pre_build_fedora39_tidy.sh | 9 ++ .gitlab/os-linux.yml | 94 +++++++++---------- .gitlab/upload.yml | 4 +- 67 files changed, 312 insertions(+), 314 deletions(-) delete mode 100644 .gitlab/ci/configure_fedora38_asan.cmake delete mode 100644 .gitlab/ci/configure_fedora38_clang_analyzer.cmake delete mode 100644 .gitlab/ci/configure_fedora38_common.cmake delete mode 100644 .gitlab/ci/configure_fedora38_common_clang.cmake delete mode 100644 .gitlab/ci/configure_fedora38_extdeps.cmake delete mode 100644 .gitlab/ci/configure_fedora38_hip_radeon.cmake delete mode 100644 .gitlab/ci/configure_fedora38_makefiles.cmake delete mode 100644 .gitlab/ci/configure_fedora38_makefiles_clang.cmake delete mode 100644 .gitlab/ci/configure_fedora38_makefiles_symlinked.cmake delete mode 100644 .gitlab/ci/configure_fedora38_ninja.cmake delete mode 100644 .gitlab/ci/configure_fedora38_ninja_clang.cmake delete mode 100644 .gitlab/ci/configure_fedora38_ninja_multi.cmake delete mode 100644 .gitlab/ci/configure_fedora38_ninja_multi_clang.cmake delete mode 100644 .gitlab/ci/configure_fedora38_sphinx.cmake delete mode 100644 .gitlab/ci/configure_fedora38_sphinx_package.cmake delete mode 100644 .gitlab/ci/configure_fedora38_tidy.cmake create mode 100644 .gitlab/ci/configure_fedora39_asan.cmake create mode 100644 .gitlab/ci/configure_fedora39_clang_analyzer.cmake create mode 100644 .gitlab/ci/configure_fedora39_common.cmake create mode 100644 .gitlab/ci/configure_fedora39_common_clang.cmake create mode 100644 .gitlab/ci/configure_fedora39_extdeps.cmake create mode 100644 .gitlab/ci/configure_fedora39_hip_radeon.cmake create mode 100644 .gitlab/ci/configure_fedora39_makefiles.cmake create mode 100644 .gitlab/ci/configure_fedora39_makefiles_clang.cmake create mode 100644 .gitlab/ci/configure_fedora39_makefiles_symlinked.cmake create mode 100644 .gitlab/ci/configure_fedora39_ninja.cmake create mode 100644 .gitlab/ci/configure_fedora39_ninja_clang.cmake create mode 100644 .gitlab/ci/configure_fedora39_ninja_multi.cmake create mode 100644 .gitlab/ci/configure_fedora39_ninja_multi_clang.cmake create mode 100644 .gitlab/ci/configure_fedora39_sphinx.cmake create mode 100644 .gitlab/ci/configure_fedora39_sphinx_package.cmake create mode 100644 .gitlab/ci/configure_fedora39_tidy.cmake delete mode 100644 .gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp create mode 100644 .gitlab/ci/ctest_memcheck_fedora39_asan.lsan.supp delete mode 100644 .gitlab/ci/env_fedora38_asan.sh delete mode 100644 .gitlab/ci/env_fedora38_clang_analyzer.sh delete mode 100644 .gitlab/ci/env_fedora38_common_clang.sh delete mode 100644 .gitlab/ci/env_fedora38_extdeps.sh delete mode 100644 .gitlab/ci/env_fedora38_hip_radeon.sh delete mode 100644 .gitlab/ci/env_fedora38_makefiles.cmake delete mode 100644 .gitlab/ci/env_fedora38_makefiles.sh delete mode 100644 .gitlab/ci/env_fedora38_makefiles_clang.sh delete mode 100644 .gitlab/ci/env_fedora38_makefiles_symlinked.cmake delete mode 100644 .gitlab/ci/env_fedora38_makefiles_symlinked.sh delete mode 100644 .gitlab/ci/env_fedora38_ninja.sh delete mode 100644 .gitlab/ci/env_fedora38_ninja_clang.sh delete mode 100644 .gitlab/ci/env_fedora38_ninja_multi.sh delete mode 100644 .gitlab/ci/env_fedora38_ninja_multi_clang.sh create mode 100644 .gitlab/ci/env_fedora39_asan.sh create mode 100644 .gitlab/ci/env_fedora39_clang_analyzer.sh create mode 100644 .gitlab/ci/env_fedora39_common_clang.sh create mode 100644 .gitlab/ci/env_fedora39_extdeps.sh create mode 100644 .gitlab/ci/env_fedora39_hip_radeon.sh create mode 100644 .gitlab/ci/env_fedora39_makefiles.cmake create mode 100644 .gitlab/ci/env_fedora39_makefiles.sh create mode 100644 .gitlab/ci/env_fedora39_makefiles_clang.sh create mode 100644 .gitlab/ci/env_fedora39_makefiles_symlinked.cmake create mode 100644 .gitlab/ci/env_fedora39_makefiles_symlinked.sh create mode 100644 .gitlab/ci/env_fedora39_ninja.sh create mode 100644 .gitlab/ci/env_fedora39_ninja_clang.sh create mode 100644 .gitlab/ci/env_fedora39_ninja_multi.sh create mode 100644 .gitlab/ci/env_fedora39_ninja_multi_clang.sh delete mode 100644 .gitlab/ci/pre_build_fedora38_tidy.sh create mode 100644 .gitlab/ci/pre_build_fedora39_tidy.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 032a6fc..b8bb4ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ p:source-package: p:doc-package: extends: - - .fedora38_sphinx_package + - .fedora39_sphinx_package - .cmake_prep_doc_linux - .linux_x86_64_tags - .cmake_doc_artifacts @@ -108,17 +108,17 @@ l:iwyu-debian12: - .cmake_cdash_artifacts - .run_automatically -l:tidy-fedora38: +l:tidy-fedora39: extends: - - .fedora38_tidy + - .fedora39_tidy - .cmake_build_linux - .linux_x86_64_tags - .cmake_cdash_artifacts - .run_automatically -l:sphinx-fedora38: +l:sphinx-fedora39: extends: - - .fedora38_sphinx + - .fedora39_sphinx - .cmake_build_linux - .cmake_sphinx_artifacts - .linux_x86_64_tags @@ -127,9 +127,9 @@ l:sphinx-fedora38: CMAKE_CI_JOB_CONTINUOUS: "true" CMAKE_CI_JOB_HELP: "true" -l:clang-analyzer-fedora38: +l:clang-analyzer-fedora39: extends: - - .fedora38_clang_analyzer + - .fedora39_clang_analyzer - .cmake_build_linux - .linux_x86_64_tags - .run_automatically @@ -223,9 +223,9 @@ t:debian12-hip-radeon: variables: CMAKE_CI_NO_MR: "true" -t:fedora38-hip-radeon: +t:fedora39-hip-radeon: extends: - - .fedora38_hip_radeon + - .fedora39_hip_radeon - .cmake_test_linux_release - .linux_x86_64_tags_radeon - .run_dependent @@ -233,9 +233,9 @@ t:fedora38-hip-radeon: variables: CMAKE_CI_NO_MR: "true" -t:fedora38-ninja-clang: +t:fedora39-ninja-clang: extends: - - .fedora38_ninja_clang + - .fedora39_ninja_clang - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -243,9 +243,9 @@ t:fedora38-ninja-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora38-ninja-multi-clang: +t:fedora39-ninja-multi-clang: extends: - - .fedora38_ninja_multi_clang + - .fedora39_ninja_multi_clang - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -253,9 +253,9 @@ t:fedora38-ninja-multi-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora38-makefiles-clang: +t:fedora39-makefiles-clang: extends: - - .fedora38_makefiles_clang + - .fedora39_makefiles_clang - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -263,17 +263,17 @@ t:fedora38-makefiles-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora38-makefiles: +t:fedora39-makefiles: extends: - - .fedora38_makefiles + - .fedora39_makefiles - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent - .needs_centos7_x86_64 -t:fedora38-makefiles-nospace: +t:fedora39-makefiles-nospace: extends: - - .fedora38_makefiles + - .fedora39_makefiles - .cmake_test_linux_release - .linux_x86_64_tags - .cmake_junit_artifacts @@ -281,7 +281,7 @@ t:fedora38-makefiles-nospace: - .needs_centos7_x86_64 variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci" - CMAKE_CI_BUILD_NAME: fedora38_makefiles_nospace + CMAKE_CI_BUILD_NAME: fedora39_makefiles_nospace CMAKE_CI_JOB_NIGHTLY: "true" t:nvhpc22.11-ninja: @@ -413,9 +413,9 @@ t:debian10-legacy: variables: CMAKE_CI_JOB_NIGHTLY: "true" -b:fedora38-ninja: +b:fedora39-ninja: extends: - - .fedora38_ninja + - .fedora39_ninja - .cmake_build_linux - .cmake_build_artifacts - .linux_x86_64_tags @@ -423,9 +423,9 @@ b:fedora38-ninja: variables: CMAKE_CI_JOB_CONTINUOUS: "true" -b:fedora38-makefiles-symlinked: +b:fedora39-makefiles-symlinked: extends: - - .fedora38_makefiles_symlinked + - .fedora39_makefiles_symlinked - .cmake_build_linux - .cmake_build_artifacts - .linux_x86_64_tags @@ -460,54 +460,54 @@ b:debian12-aarch64-extdeps: variables: CMAKE_CI_JOB_NIGHTLY: "true" -b:fedora38-extdeps: +b:fedora39-extdeps: extends: - - .fedora38_extdeps + - .fedora39_extdeps - .cmake_build_linux_standalone - .linux_x86_64_tags - .run_manually variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora38-ninja: +t:fedora39-ninja: extends: - - .fedora38_ninja + - .fedora39_ninja - .cmake_test_linux - .linux_x86_64_tags_x11 - .cmake_test_artifacts - .run_dependent dependencies: - - b:fedora38-ninja + - b:fedora39-ninja needs: - - b:fedora38-ninja + - b:fedora39-ninja variables: CMAKE_CI_JOB_CONTINUOUS: "true" -t:fedora38-makefiles-symlinked: +t:fedora39-makefiles-symlinked: extends: - - .fedora38_makefiles_symlinked + - .fedora39_makefiles_symlinked - .cmake_test_linux - .linux_x86_64_tags_x11 - .cmake_test_artifacts - .run_dependent dependencies: - - b:fedora38-makefiles-symlinked + - b:fedora39-makefiles-symlinked needs: - - b:fedora38-makefiles-symlinked + - b:fedora39-makefiles-symlinked variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora38-ninja-multi: +t:fedora39-ninja-multi: extends: - - .fedora38_ninja_multi + - .fedora39_ninja_multi - .cmake_test_linux_external - .linux_x86_64_tags - .cmake_junit_artifacts - .run_dependent dependencies: - - t:fedora38-ninja + - t:fedora39-ninja needs: - - t:fedora38-ninja + - t:fedora39-ninja t:intel2016-makefiles: extends: @@ -874,9 +874,9 @@ u:linux-aarch64-package: ## Sanitizer builds -b:fedora38-asan: +b:fedora39-asan: extends: - - .fedora38_asan + - .fedora39_asan - .cmake_build_linux - .cmake_build_artifacts - .linux_x86_64_tags @@ -884,16 +884,16 @@ b:fedora38-asan: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora38-asan: +t:fedora39-asan: extends: - - .fedora38_asan + - .fedora39_asan - .cmake_memcheck_linux - .linux_x86_64_tags - .run_dependent dependencies: - - b:fedora38-asan + - b:fedora39-asan needs: - - b:fedora38-asan + - b:fedora39-asan variables: CMAKE_CI_JOB_NIGHTLY: "true" diff --git a/.gitlab/ci/configure_fedora38_asan.cmake b/.gitlab/ci/configure_fedora38_asan.cmake deleted file mode 100644 index 8eae500..0000000 --- a/.gitlab/ci/configure_fedora38_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_fedora38_common.cmake") diff --git a/.gitlab/ci/configure_fedora38_clang_analyzer.cmake b/.gitlab/ci/configure_fedora38_clang_analyzer.cmake deleted file mode 100644 index c11eef1..0000000 --- a/.gitlab/ci/configure_fedora38_clang_analyzer.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(configure_no_sccache 1) - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake") diff --git a/.gitlab/ci/configure_fedora38_common.cmake b/.gitlab/ci/configure_fedora38_common.cmake deleted file mode 100644 index 4484e26..0000000 --- a/.gitlab/ci/configure_fedora38_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_fedora38_common_clang.cmake b/.gitlab/ci/configure_fedora38_common_clang.cmake deleted file mode 100644 index 70c9df9..0000000 --- a/.gitlab/ci/configure_fedora38_common_clang.cmake +++ /dev/null @@ -1,6 +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_Fortran_FLAGS "-flang-experimental-exec" CACHE STRING "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora38_extdeps.cmake b/.gitlab/ci/configure_fedora38_extdeps.cmake deleted file mode 100644 index 8e545f5..0000000 --- a/.gitlab/ci/configure_fedora38_extdeps.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_extdeps_common.cmake") diff --git a/.gitlab/ci/configure_fedora38_hip_radeon.cmake b/.gitlab/ci/configure_fedora38_hip_radeon.cmake deleted file mode 100644 index c7d7004..0000000 --- a/.gitlab/ci/configure_fedora38_hip_radeon.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(CMake_TEST_HIP "amd" CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora38_makefiles.cmake b/.gitlab/ci/configure_fedora38_makefiles.cmake deleted file mode 100644 index a3881cf..0000000 --- a/.gitlab/ci/configure_fedora38_makefiles.cmake +++ /dev/null @@ -1,103 +0,0 @@ -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_FindALSA "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_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" 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_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_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_UseSWIG "ON" CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora38_makefiles_clang.cmake b/.gitlab/ci/configure_fedora38_makefiles_clang.cmake deleted file mode 100644 index 3ac23be..0000000 --- a/.gitlab/ci/configure_fedora38_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_fedora38_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora38_makefiles_symlinked.cmake b/.gitlab/ci/configure_fedora38_makefiles_symlinked.cmake deleted file mode 100644 index 177bbcf..0000000 --- a/.gitlab/ci/configure_fedora38_makefiles_symlinked.cmake +++ /dev/null @@ -1,2 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_symlinked_common.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake") diff --git a/.gitlab/ci/configure_fedora38_ninja.cmake b/.gitlab/ci/configure_fedora38_ninja.cmake deleted file mode 100644 index ac6b9f6..0000000 --- a/.gitlab/ci/configure_fedora38_ninja.cmake +++ /dev/null @@ -1,14 +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_TLS_VERIFY_URL "https://gitlab.kitware.com" 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_fedora38_common.cmake") diff --git a/.gitlab/ci/configure_fedora38_ninja_clang.cmake b/.gitlab/ci/configure_fedora38_ninja_clang.cmake deleted file mode 100644 index 848c5b6..0000000 --- a/.gitlab/ci/configure_fedora38_ninja_clang.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "") -set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora38_ninja_multi.cmake b/.gitlab/ci/configure_fedora38_ninja_multi.cmake deleted file mode 100644 index 94af721..0000000 --- a/.gitlab/ci/configure_fedora38_ninja_multi.cmake +++ /dev/null @@ -1,5 +0,0 @@ -if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") - set(CMake_TEST_ISPC "ON" CACHE STRING "") -endif() - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora38_ninja_multi_clang.cmake b/.gitlab/ci/configure_fedora38_ninja_multi_clang.cmake deleted file mode 100644 index 848c5b6..0000000 --- a/.gitlab/ci/configure_fedora38_ninja_multi_clang.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "") -set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora38_sphinx.cmake b/.gitlab/ci/configure_fedora38_sphinx.cmake deleted file mode 100644 index 90d159b..0000000 --- a/.gitlab/ci/configure_fedora38_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_fedora38_sphinx_package.cmake b/.gitlab/ci/configure_fedora38_sphinx_package.cmake deleted file mode 100644 index e839de8..0000000 --- a/.gitlab/ci/configure_fedora38_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_fedora38_tidy.cmake b/.gitlab/ci/configure_fedora38_tidy.cmake deleted file mode 100644 index 5b062da..0000000 --- a/.gitlab/ci/configure_fedora38_tidy.cmake +++ /dev/null @@ -1,5 +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 "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake") diff --git a/.gitlab/ci/configure_fedora39_asan.cmake b/.gitlab/ci/configure_fedora39_asan.cmake new file mode 100644 index 0000000..872517c --- /dev/null +++ b/.gitlab/ci/configure_fedora39_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_fedora39_common.cmake") diff --git a/.gitlab/ci/configure_fedora39_clang_analyzer.cmake b/.gitlab/ci/configure_fedora39_clang_analyzer.cmake new file mode 100644 index 0000000..1bfb3fb --- /dev/null +++ b/.gitlab/ci/configure_fedora39_clang_analyzer.cmake @@ -0,0 +1,3 @@ +set(configure_no_sccache 1) + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake") diff --git a/.gitlab/ci/configure_fedora39_common.cmake b/.gitlab/ci/configure_fedora39_common.cmake new file mode 100644 index 0000000..4484e26 --- /dev/null +++ b/.gitlab/ci/configure_fedora39_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_fedora39_common_clang.cmake b/.gitlab/ci/configure_fedora39_common_clang.cmake new file mode 100644 index 0000000..1b3835a --- /dev/null +++ b/.gitlab/ci/configure_fedora39_common_clang.cmake @@ -0,0 +1,5 @@ +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 "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora39_extdeps.cmake b/.gitlab/ci/configure_fedora39_extdeps.cmake new file mode 100644 index 0000000..8e545f5 --- /dev/null +++ b/.gitlab/ci/configure_fedora39_extdeps.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_extdeps_common.cmake") diff --git a/.gitlab/ci/configure_fedora39_hip_radeon.cmake b/.gitlab/ci/configure_fedora39_hip_radeon.cmake new file mode 100644 index 0000000..c7d7004 --- /dev/null +++ b/.gitlab/ci/configure_fedora39_hip_radeon.cmake @@ -0,0 +1,3 @@ +set(CMake_TEST_HIP "amd" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora39_makefiles.cmake b/.gitlab/ci/configure_fedora39_makefiles.cmake new file mode 100644 index 0000000..a3881cf --- /dev/null +++ b/.gitlab/ci/configure_fedora39_makefiles.cmake @@ -0,0 +1,103 @@ +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_FindALSA "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_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" 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_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_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_UseSWIG "ON" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora39_makefiles_clang.cmake b/.gitlab/ci/configure_fedora39_makefiles_clang.cmake new file mode 100644 index 0000000..a85ae70 --- /dev/null +++ b/.gitlab/ci/configure_fedora39_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_fedora39_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora39_makefiles_symlinked.cmake b/.gitlab/ci/configure_fedora39_makefiles_symlinked.cmake new file mode 100644 index 0000000..b53ab66 --- /dev/null +++ b/.gitlab/ci/configure_fedora39_makefiles_symlinked.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_symlinked_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake") diff --git a/.gitlab/ci/configure_fedora39_ninja.cmake b/.gitlab/ci/configure_fedora39_ninja.cmake new file mode 100644 index 0000000..ff233a3 --- /dev/null +++ b/.gitlab/ci/configure_fedora39_ninja.cmake @@ -0,0 +1,14 @@ +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_TLS_VERIFY_URL "https://gitlab.kitware.com" 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_fedora39_common.cmake") diff --git a/.gitlab/ci/configure_fedora39_ninja_clang.cmake b/.gitlab/ci/configure_fedora39_ninja_clang.cmake new file mode 100644 index 0000000..49552d6 --- /dev/null +++ b/.gitlab/ci/configure_fedora39_ninja_clang.cmake @@ -0,0 +1,4 @@ +set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "") +set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora39_ninja_multi.cmake b/.gitlab/ci/configure_fedora39_ninja_multi.cmake new file mode 100644 index 0000000..94af721 --- /dev/null +++ b/.gitlab/ci/configure_fedora39_ninja_multi.cmake @@ -0,0 +1,5 @@ +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora39_ninja_multi_clang.cmake b/.gitlab/ci/configure_fedora39_ninja_multi_clang.cmake new file mode 100644 index 0000000..49552d6 --- /dev/null +++ b/.gitlab/ci/configure_fedora39_ninja_multi_clang.cmake @@ -0,0 +1,4 @@ +set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "") +set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora39_sphinx.cmake b/.gitlab/ci/configure_fedora39_sphinx.cmake new file mode 100644 index 0000000..90d159b --- /dev/null +++ b/.gitlab/ci/configure_fedora39_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_fedora39_sphinx_package.cmake b/.gitlab/ci/configure_fedora39_sphinx_package.cmake new file mode 100644 index 0000000..e839de8 --- /dev/null +++ b/.gitlab/ci/configure_fedora39_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_fedora39_tidy.cmake b/.gitlab/ci/configure_fedora39_tidy.cmake new file mode 100644 index 0000000..4ed1eb3 --- /dev/null +++ b/.gitlab/ci/configure_fedora39_tidy.cmake @@ -0,0 +1,5 @@ +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 "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake") diff --git a/.gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp deleted file mode 100644 index 8ec1a03..0000000 --- a/.gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp +++ /dev/null @@ -1 +0,0 @@ -# Add 'leak:' lines here to suppress known leaks. diff --git a/.gitlab/ci/ctest_memcheck_fedora39_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora39_asan.lsan.supp new file mode 100644 index 0000000..8ec1a03 --- /dev/null +++ b/.gitlab/ci/ctest_memcheck_fedora39_asan.lsan.supp @@ -0,0 +1 @@ +# Add 'leak:' lines here to suppress known leaks. diff --git a/.gitlab/ci/env_fedora38_asan.sh b/.gitlab/ci/env_fedora38_asan.sh deleted file mode 100644 index e976486..0000000 --- a/.gitlab/ci/env_fedora38_asan.sh +++ /dev/null @@ -1,2 +0,0 @@ -export CC=/usr/bin/clang -export CXX=/usr/bin/clang++ diff --git a/.gitlab/ci/env_fedora38_clang_analyzer.sh b/.gitlab/ci/env_fedora38_clang_analyzer.sh deleted file mode 100644 index d732c0b..0000000 --- a/.gitlab/ci/env_fedora38_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_fedora38_common_clang.sh b/.gitlab/ci/env_fedora38_common_clang.sh deleted file mode 100644 index fc9c041..0000000 --- a/.gitlab/ci/env_fedora38_common_clang.sh +++ /dev/null @@ -1,4 +0,0 @@ -export CC=/usr/bin/clang-16 -export CXX=/usr/bin/clang++-16 -export FC=/usr/bin/flang-new -export FFLAGS=-flang-experimental-exec diff --git a/.gitlab/ci/env_fedora38_extdeps.sh b/.gitlab/ci/env_fedora38_extdeps.sh deleted file mode 100644 index 7076e18..0000000 --- a/.gitlab/ci/env_fedora38_extdeps.sh +++ /dev/null @@ -1 +0,0 @@ -source .gitlab/ci/env_extdeps_common.sh diff --git a/.gitlab/ci/env_fedora38_hip_radeon.sh b/.gitlab/ci/env_fedora38_hip_radeon.sh deleted file mode 100644 index 812ef5a..0000000 --- a/.gitlab/ci/env_fedora38_hip_radeon.sh +++ /dev/null @@ -1 +0,0 @@ -export HIPCXX=/usr/bin/clang++-16 diff --git a/.gitlab/ci/env_fedora38_makefiles.cmake b/.gitlab/ci/env_fedora38_makefiles.cmake deleted file mode 100644 index ef13cda..0000000 --- a/.gitlab/ci/env_fedora38_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_fedora38_makefiles.sh b/.gitlab/ci/env_fedora38_makefiles.sh deleted file mode 100644 index c482642..0000000 --- a/.gitlab/ci/env_fedora38_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_fedora38_makefiles_clang.sh b/.gitlab/ci/env_fedora38_makefiles_clang.sh deleted file mode 100644 index 9f3edde..0000000 --- a/.gitlab/ci/env_fedora38_makefiles_clang.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora38_common_clang.sh diff --git a/.gitlab/ci/env_fedora38_makefiles_symlinked.cmake b/.gitlab/ci/env_fedora38_makefiles_symlinked.cmake deleted file mode 100644 index 2accabf..0000000 --- a/.gitlab/ci/env_fedora38_makefiles_symlinked.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/env_fedora38_makefiles.cmake") diff --git a/.gitlab/ci/env_fedora38_makefiles_symlinked.sh b/.gitlab/ci/env_fedora38_makefiles_symlinked.sh deleted file mode 100644 index 452d3785..0000000 --- a/.gitlab/ci/env_fedora38_makefiles_symlinked.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora38_makefiles.sh diff --git a/.gitlab/ci/env_fedora38_ninja.sh b/.gitlab/ci/env_fedora38_ninja.sh deleted file mode 100644 index 217ff30..0000000 --- a/.gitlab/ci/env_fedora38_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_fedora38_ninja_clang.sh b/.gitlab/ci/env_fedora38_ninja_clang.sh deleted file mode 100644 index 9f3edde..0000000 --- a/.gitlab/ci/env_fedora38_ninja_clang.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora38_common_clang.sh diff --git a/.gitlab/ci/env_fedora38_ninja_multi.sh b/.gitlab/ci/env_fedora38_ninja_multi.sh deleted file mode 100644 index 217ff30..0000000 --- a/.gitlab/ci/env_fedora38_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_fedora38_ninja_multi_clang.sh b/.gitlab/ci/env_fedora38_ninja_multi_clang.sh deleted file mode 100644 index 9f3edde..0000000 --- a/.gitlab/ci/env_fedora38_ninja_multi_clang.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora38_common_clang.sh diff --git a/.gitlab/ci/env_fedora39_asan.sh b/.gitlab/ci/env_fedora39_asan.sh new file mode 100644 index 0000000..e976486 --- /dev/null +++ b/.gitlab/ci/env_fedora39_asan.sh @@ -0,0 +1,2 @@ +export CC=/usr/bin/clang +export CXX=/usr/bin/clang++ diff --git a/.gitlab/ci/env_fedora39_clang_analyzer.sh b/.gitlab/ci/env_fedora39_clang_analyzer.sh new file mode 100644 index 0000000..d732c0b --- /dev/null +++ b/.gitlab/ci/env_fedora39_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_fedora39_common_clang.sh b/.gitlab/ci/env_fedora39_common_clang.sh new file mode 100644 index 0000000..076669b --- /dev/null +++ b/.gitlab/ci/env_fedora39_common_clang.sh @@ -0,0 +1,3 @@ +export CC=/usr/bin/clang-17 +export CXX=/usr/bin/clang++-17 +export FC=/usr/bin/flang-new diff --git a/.gitlab/ci/env_fedora39_extdeps.sh b/.gitlab/ci/env_fedora39_extdeps.sh new file mode 100644 index 0000000..7076e18 --- /dev/null +++ b/.gitlab/ci/env_fedora39_extdeps.sh @@ -0,0 +1 @@ +source .gitlab/ci/env_extdeps_common.sh diff --git a/.gitlab/ci/env_fedora39_hip_radeon.sh b/.gitlab/ci/env_fedora39_hip_radeon.sh new file mode 100644 index 0000000..0f7df8d --- /dev/null +++ b/.gitlab/ci/env_fedora39_hip_radeon.sh @@ -0,0 +1 @@ +export HIPCXX=/usr/bin/clang++-17 diff --git a/.gitlab/ci/env_fedora39_makefiles.cmake b/.gitlab/ci/env_fedora39_makefiles.cmake new file mode 100644 index 0000000..ef13cda --- /dev/null +++ b/.gitlab/ci/env_fedora39_makefiles.cmake @@ -0,0 +1 @@ +set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-3.0.4") diff --git a/.gitlab/ci/env_fedora39_makefiles.sh b/.gitlab/ci/env_fedora39_makefiles.sh new file mode 100644 index 0000000..c482642 --- /dev/null +++ b/.gitlab/ci/env_fedora39_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_fedora39_makefiles_clang.sh b/.gitlab/ci/env_fedora39_makefiles_clang.sh new file mode 100644 index 0000000..6200f82 --- /dev/null +++ b/.gitlab/ci/env_fedora39_makefiles_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora39_common_clang.sh diff --git a/.gitlab/ci/env_fedora39_makefiles_symlinked.cmake b/.gitlab/ci/env_fedora39_makefiles_symlinked.cmake new file mode 100644 index 0000000..052e9a7 --- /dev/null +++ b/.gitlab/ci/env_fedora39_makefiles_symlinked.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/env_fedora39_makefiles.cmake") diff --git a/.gitlab/ci/env_fedora39_makefiles_symlinked.sh b/.gitlab/ci/env_fedora39_makefiles_symlinked.sh new file mode 100644 index 0000000..39ac189 --- /dev/null +++ b/.gitlab/ci/env_fedora39_makefiles_symlinked.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora39_makefiles.sh diff --git a/.gitlab/ci/env_fedora39_ninja.sh b/.gitlab/ci/env_fedora39_ninja.sh new file mode 100644 index 0000000..217ff30 --- /dev/null +++ b/.gitlab/ci/env_fedora39_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_fedora39_ninja_clang.sh b/.gitlab/ci/env_fedora39_ninja_clang.sh new file mode 100644 index 0000000..6200f82 --- /dev/null +++ b/.gitlab/ci/env_fedora39_ninja_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora39_common_clang.sh diff --git a/.gitlab/ci/env_fedora39_ninja_multi.sh b/.gitlab/ci/env_fedora39_ninja_multi.sh new file mode 100644 index 0000000..217ff30 --- /dev/null +++ b/.gitlab/ci/env_fedora39_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_fedora39_ninja_multi_clang.sh b/.gitlab/ci/env_fedora39_ninja_multi_clang.sh new file mode 100644 index 0000000..6200f82 --- /dev/null +++ b/.gitlab/ci/env_fedora39_ninja_multi_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora39_common_clang.sh diff --git a/.gitlab/ci/pre_build_fedora38_tidy.sh b/.gitlab/ci/pre_build_fedora38_tidy.sh deleted file mode 100644 index 7580ef1..0000000 --- a/.gitlab/ci/pre_build_fedora38_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_fedora39_tidy.sh b/.gitlab/ci/pre_build_fedora39_tidy.sh new file mode 100644 index 0000000..7580ef1 --- /dev/null +++ b/.gitlab/ci/pre_build_fedora39_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 8894057..f529ab2 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -5,7 +5,7 @@ ### Release .linux_prep_source: - image: "fedora:38" + image: "fedora:39" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -68,8 +68,8 @@ ### Fedora -.fedora38: - image: "kitware/cmake:ci-fedora38-x86_64-2023-08-07" +.fedora39: + image: "kitware/cmake:ci-fedora39-x86_64-2023-11-16" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" @@ -77,37 +77,37 @@ #### Lint builds -.fedora38_tidy: - extends: .fedora38 +.fedora39_tidy: + extends: .fedora39 variables: - CMAKE_CONFIGURATION: fedora38_tidy + CMAKE_CONFIGURATION: fedora39_tidy CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_CI_NO_INSTALL: 1 -.fedora38_clang_analyzer: - extends: .fedora38 +.fedora39_clang_analyzer: + extends: .fedora39 variables: - CMAKE_CONFIGURATION: fedora38_clang_analyzer + CMAKE_CONFIGURATION: fedora39_clang_analyzer CMAKE_CI_BUILD_TYPE: Debug CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_CI_NO_INSTALL: 1 -.fedora38_sphinx: - extends: .fedora38 +.fedora39_sphinx: + extends: .fedora39 variables: - CMAKE_CONFIGURATION: fedora38_sphinx + CMAKE_CONFIGURATION: fedora39_sphinx CTEST_NO_WARNINGS_ALLOWED: 1 CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" CMAKE_CI_NO_INSTALL: 1 -.fedora38_sphinx_package: - extends: .fedora38 +.fedora39_sphinx_package: + extends: .fedora39 variables: - CMAKE_CONFIGURATION: fedora38_sphinx_package + CMAKE_CONFIGURATION: fedora39_sphinx_package CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" #### Build and test @@ -163,43 +163,43 @@ CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora38_extdeps: - extends: .fedora38 +.fedora39_extdeps: + extends: .fedora39 variables: - CMAKE_CONFIGURATION: fedora38_extdeps + CMAKE_CONFIGURATION: fedora39_extdeps CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora38_ninja: - extends: .fedora38 +.fedora39_ninja: + extends: .fedora39 variables: - CMAKE_CONFIGURATION: fedora38_ninja + CMAKE_CONFIGURATION: fedora39_ninja CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora38_ninja_multi: - extends: .fedora38 +.fedora39_ninja_multi: + extends: .fedora39 variables: - CMAKE_CONFIGURATION: fedora38_ninja_multi + CMAKE_CONFIGURATION: fedora39_ninja_multi CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Ninja Multi-Config" -.fedora38_makefiles: - extends: .fedora38 +.fedora39_makefiles: + extends: .fedora39 variables: - CMAKE_CONFIGURATION: fedora38_makefiles + CMAKE_CONFIGURATION: fedora39_makefiles CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" -.fedora38_makefiles_symlinked: - extends: .fedora38 +.fedora39_makefiles_symlinked: + extends: .fedora39 variables: - CMAKE_CONFIGURATION: fedora38_makefiles_symlinked + CMAKE_CONFIGURATION: fedora39_makefiles_symlinked CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" CMAKE_CI_IN_SYMLINK_TREE: 1 @@ -220,24 +220,24 @@ variables: CMAKE_CONFIGURATION: debian12_ninja_clang -.fedora38_makefiles_clang: - extends: .fedora38 +.fedora39_makefiles_clang: + extends: .fedora39 variables: - CMAKE_CONFIGURATION: fedora38_makefiles_clang + CMAKE_CONFIGURATION: fedora39_makefiles_clang CMAKE_GENERATOR: "Unix Makefiles" -.fedora38_ninja_clang: - extends: .fedora38 +.fedora39_ninja_clang: + extends: .fedora39 variables: - CMAKE_CONFIGURATION: fedora38_ninja_clang + CMAKE_CONFIGURATION: fedora39_ninja_clang -.fedora38_ninja_multi_clang: - extends: .fedora38 +.fedora39_ninja_multi_clang: + extends: .fedora39 variables: - CMAKE_CONFIGURATION: fedora38_ninja_multi_clang + CMAKE_CONFIGURATION: fedora39_ninja_multi_clang CMAKE_GENERATOR: "Ninja Multi-Config" ### Sanitizers @@ -253,13 +253,13 @@ CTEST_MEMORYCHECK_TYPE: AddressSanitizer CTEST_MEMORYCHECK_SANITIZER_OPTIONS: "" -.fedora38_asan: +.fedora39_asan: extends: - - .fedora38 + - .fedora39 - .fedora_asan_addon variables: - CMAKE_CONFIGURATION: fedora38_asan + CMAKE_CONFIGURATION: fedora39_asan ### Intel Compiler @@ -392,11 +392,11 @@ CMAKE_CONFIGURATION: debian12_hip_radeon CTEST_LABELS: "HIP" -.fedora38_hip_radeon: - extends: .fedora38 +.fedora39_hip_radeon: + extends: .fedora39 variables: - CMAKE_CONFIGURATION: fedora38_hip_radeon + CMAKE_CONFIGURATION: fedora39_hip_radeon CTEST_LABELS: "HIP" .hip5.5_nvidia: @@ -526,7 +526,7 @@ .cmake_codespell_linux: stage: build - extends: .fedora38 + extends: .fedora39 script: - .gitlab/ci/codespell.sh interruptible: true @@ -670,7 +670,7 @@ .cmake_org_help: stage: build extends: - - .fedora38 + - .fedora39 - .linux_x86_64_tags - .cmake_org_help_artifacts script: diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml index caa2119..56793af 100644 --- a/.gitlab/upload.yml +++ b/.gitlab/upload.yml @@ -1,7 +1,7 @@ # Steps for uploading artifacts .rsync_upload_package: - image: "fedora:38" + image: "fedora:39" stage: upload tags: - cmake @@ -21,7 +21,7 @@ .rsync_upload_help: stage: upload - image: "fedora:38" + image: "fedora:39" tags: - cmake - docker -- cgit v0.12 From a8be80ccf258dc38845d1a934242ecd2d242a400 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Nov 2023 13:11:36 -0500 Subject: ci: Drop now-unnecessary Clang rules for CXXModules tests Starting with LLVM/Clang 17 we can use C++ modules with compiler extensions enabled. --- .gitlab/ci/configure_fedora39_ninja_clang.cmake | 1 - .gitlab/ci/configure_fedora39_ninja_multi_clang.cmake | 1 - .gitlab/ci/configure_windows_clang_ninja.cmake | 1 - .gitlab/ci/cxx_modules_rules_clang.cmake | 3 --- 4 files changed, 6 deletions(-) delete mode 100644 .gitlab/ci/cxx_modules_rules_clang.cmake diff --git a/.gitlab/ci/configure_fedora39_ninja_clang.cmake b/.gitlab/ci/configure_fedora39_ninja_clang.cmake index 49552d6..79d3eaa 100644 --- a/.gitlab/ci/configure_fedora39_ninja_clang.cmake +++ b/.gitlab/ci/configure_fedora39_ninja_clang.cmake @@ -1,4 +1,3 @@ set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "") -set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "") include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora39_ninja_multi_clang.cmake b/.gitlab/ci/configure_fedora39_ninja_multi_clang.cmake index 49552d6..79d3eaa 100644 --- a/.gitlab/ci/configure_fedora39_ninja_multi_clang.cmake +++ b/.gitlab/ci/configure_fedora39_ninja_multi_clang.cmake @@ -1,4 +1,3 @@ set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "") -set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "") include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common_clang.cmake") diff --git a/.gitlab/ci/configure_windows_clang_ninja.cmake b/.gitlab/ci/configure_windows_clang_ninja.cmake index 8a65eef..fcb2d46 100644 --- a/.gitlab/ci/configure_windows_clang_ninja.cmake +++ b/.gitlab/ci/configure_windows_clang_ninja.cmake @@ -1,5 +1,4 @@ if("$ENV{CMAKE_CI_BUILD_NAME}" MATCHES "(^|_)gnu(_|$)") set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "") - set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "") endif() include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_clang_common.cmake") diff --git a/.gitlab/ci/cxx_modules_rules_clang.cmake b/.gitlab/ci/cxx_modules_rules_clang.cmake deleted file mode 100644 index 1268244..0000000 --- a/.gitlab/ci/cxx_modules_rules_clang.cmake +++ /dev/null @@ -1,3 +0,0 @@ -# Default to C++ extensions being off. Clang's modules support have trouble -# with extensions right now. -set(CMAKE_CXX_EXTENSIONS OFF) -- cgit v0.12 From 18145e8745025d93dd74f0b6338642081e70aeaf Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Nov 2023 17:01:20 -0500 Subject: ci: Update FindMPI test environment for mpich on Fedora 39 An explicit `FI_PROVIDER=tcp` seems to be needed to pass the test. --- .gitlab/ci/configure_fedora39_makefiles.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/ci/configure_fedora39_makefiles.cmake b/.gitlab/ci/configure_fedora39_makefiles.cmake index a3881cf..953b2a8 100644 --- a/.gitlab/ci/configure_fedora39_makefiles.cmake +++ b/.gitlab/ci/configure_fedora39_makefiles.cmake @@ -57,7 +57,7 @@ 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" CACHE STRING "") +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 "") -- cgit v0.12 From 9283b206593197d56662b4696691fd274729a100 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Nov 2023 14:43:26 -0500 Subject: ci: Suppress CPack/RPM tests pending fix for Fedora 39 Issue: #25421 --- .gitlab/ci/ctest_exclusions.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitlab/ci/ctest_exclusions.cmake b/.gitlab/ci/ctest_exclusions.cmake index a2789c3..159c1c8 100644 --- a/.gitlab/ci/ctest_exclusions.cmake +++ b/.gitlab/ci/ctest_exclusions.cmake @@ -34,6 +34,15 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "nvhpc_") ) endif() +if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "fedora39_makefiles") + list(APPEND test_exclusions + # FIXME(#25421): CPack/RPM needs an update for Fedora 39. + "^CPackComponentsForAll-RPM-default$" + "^CPackComponentsForAll-RPM-AllInOne$" + "^CPackComponentsForAll-RPM-OnePackPerGroup$" + ) +endif() + string(REPLACE ";" "|" test_exclusions "${test_exclusions}") if (test_exclusions) set(test_exclusions "(${test_exclusions})") -- cgit v0.12