Adjust include_guard() to account for variable scope

FNALssi · Jan 31, 2024 · fafee8f · fafee8f
1 parent 28a6001
commit fafee8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Modules/CetGenerateSphinxDocs.cmake b/Modules/CetGenerateSphinxDocs.cmake
@@ -2,17 +2,19 @@
 CetGenerateSphinxDocs
 ---------------------
 #]================================================================]
-include_guard(GLOBAL)
+include_guard()
+
+cmake_minimum_required(VERSION 3.20...3.27 FATAL_ERROR)
 
 get_property(_cgs_job_pools GLOBAL PROPERTY JOB_POOLS)
 if (NOT _cgs_job_pools MATCHES "(^|;)sphinx_doc=[0-9]")
   set_property(GLOBAL APPEND PROPERTY JOB_POOLS sphinx_doc=1)
 endif()
 
-cmake_minimum_required(VERSION 3.20...3.27 FATAL_ERROR)
-
 set(_CGSD_VDATA_VERSION 1)
 
+include_guard(GLOBAL)
+
 function(cet_generate_sphinx_docs)
   if (NOT BUILD_DOCS) # Disabled.
     return()

diff --git a/Modules/compat/art/CetCMPCleaner.cmake b/Modules/compat/art/CetCMPCleaner.cmake
@@ -2,7 +2,7 @@
 X
 -
 #]================================================================]
-include_guard(GLOBAL)
+include_guard()
 
 cmake_minimum_required(VERSION 3.20...3.27 FATAL_ERROR)
 
@@ -11,6 +11,8 @@ set(_cet_cmp_compat_art_version 3.13.02-alpha CACHE INTERNAL "art suite compatib
 set(_cet_cmp_compat_canvas_root_io_version 1.11.00-alpha CACHE INTERNAL "canvas_root_io compatibility modules version")
 set(_cet_cmp_compat_messagefacility_version 2.10.00-alpha CACHE INTERNAL "messagefacility compatibility modules version")
 
+include_guard(GLOBAL)
+
 if (COMMAND _include)
   message(WARNING "include() has already been overridden: compatibility with art suites < ${_cet_cmp_compat_art_version} cannot be assured")
 endif()