From 406afdfd13027295c0bb223331cbdc2fa4166799 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Sat, 24 Feb 2024 20:10:00 +0100 Subject: [PATCH 1/2] [cmake] Make Minuit2 build option deprecation warning less alarming To avoid worry reports in the forum worrying about whether Minuit2 is gonna be removed. See https://root-forum.cern.ch/t/will-minuit2-be-removed-from-root/58078 --- cmake/modules/RootBuildOptions.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake index 80fc310b76453..4836d317e8f6f 100644 --- a/cmake/modules/RootBuildOptions.cmake +++ b/cmake/modules/RootBuildOptions.cmake @@ -413,13 +413,13 @@ foreach(opt afdsmgrd afs alien bonjour castor chirp cxx11 cxx14 cxx17 geocad gfa endforeach() #---Deprecated options------------------------------------------------------------------------ -foreach(opt cxxmodules exceptions oracle pythia6 pythia6_nolink minuit2) +foreach(opt cxxmodules exceptions oracle pythia6 pythia6_nolink) if(${opt}) message(DEPRECATION ">>> Option '${opt}' is deprecated and will be removed in the next release of ROOT. Please contact root-dev@cern.ch should you still need it.") endif() endforeach() -foreach(opt builtin_afterimage) +foreach(opt builtin_afterimage minuit2) if(NOT ${opt}) message(DEPRECATION ">>> Option '${opt}' is deprecated and will be removed in the next release of ROOT. It should always be ON. Please contact root-dev@cern.ch should you still need it.") endif() From c4489dd2535f2f5491519ceb7bff99a246e59ccd Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Sat, 24 Feb 2024 20:14:53 +0100 Subject: [PATCH 2/2] [cmake] clarify wording of deprecate-OFF --- cmake/modules/RootBuildOptions.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake index 4836d317e8f6f..7d67f809ebb83 100644 --- a/cmake/modules/RootBuildOptions.cmake +++ b/cmake/modules/RootBuildOptions.cmake @@ -421,7 +421,7 @@ endforeach() foreach(opt builtin_afterimage minuit2) if(NOT ${opt}) - message(DEPRECATION ">>> Option '${opt}' is deprecated and will be removed in the next release of ROOT. It should always be ON. Please contact root-dev@cern.ch should you still need it.") + message(DEPRECATION ">>> Option '${opt}' is deprecated: in the future it will always be set to ON. In the next release of ROOT, you will no longer be able to disable this feature. Please contact root-dev@cern.ch should you still need disabling it.") endif() endforeach()