From 0dfd939077b7df22c55b308a221f952439acb3b8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 13 Oct 2022 10:39:10 -0400 Subject: cmFindPackageCommand: Suppress LCC false-positive warning Extend the LCC warning suppression from commit 08e7fb3cfa (cmFindPackageCommand: Compile-time path generator expressions, 2022-07-05, v3.25.0-rc1~361^2~5) to cover a new number for the same warning, now produced by LCC 1.26.15. --- Source/cmFindPackageCommand.cxx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index 3f8378b..60b0a7b 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -377,6 +377,8 @@ private: # pragma diag_suppress 1222 // invalid error number (3288, but works anyway) # define CM_LCC_DIAG_SUPPRESS_3288 # pragma diag_suppress 3288 // parameter was declared but never referenced +# define CM_LCC_DIAG_SUPPRESS_3301 +# pragma diag_suppress 3301 // parameter was declared but never referenced #endif void ResetGenerator() @@ -421,6 +423,11 @@ bool TryGeneratedPaths(CallbackFn&& filesCollector, return false; } +#ifdef CM_LCC_DIAG_SUPPRESS_3301 +# undef CM_LCC_DIAG_SUPPRESS_3301 +# pragma diag_default 3301 +#endif + #ifdef CM_LCC_DIAG_SUPPRESS_3288 # undef CM_LCC_DIAG_SUPPRESS_3288 # pragma diag_default 3288 -- cgit v0.12 From 2de1458c3c325516f738a66a25f7268885c5264b Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 13 Oct 2022 10:47:16 -0400 Subject: Tests: Teach CheckSourceTree test to clean up some specific known files Some nightly builds occasionally leave some log files behind due to local configuration. Remove them before checking the source tree since they are known to not be CMake bugs leaving behind source tree modifications in the test suite. --- Tests/CheckSourceTree/check.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Tests/CheckSourceTree/check.cmake b/Tests/CheckSourceTree/check.cmake index c2e3529..a59ffb5 100644 --- a/Tests/CheckSourceTree/check.cmake +++ b/Tests/CheckSourceTree/check.cmake @@ -3,6 +3,13 @@ if(DEFINED ENV{CTEST_REAL_HOME}) set(ENV{HOME} "$ENV{CTEST_REAL_HOME}") endif() +file(GLOB known_files + "${CMake_SOURCE_DIR}/Tests/JavaExportImport/InstallExport/hs_err_pid*.log" + ) +if(known_files) + file(REMOVE ${known_files}) +endif() + execute_process( COMMAND "${GIT_EXECUTABLE}" status WORKING_DIRECTORY "${CMake_SOURCE_DIR}" -- cgit v0.12