Replace manual include guards with include_guard() (TriBITSPub#411)

bartlettroscoe · Oct 22, 2021 · 1e3542d · 1e3542d
1 parent bc14759
commit 1e3542d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/tribits/core/package_arch/TribitsReportInvalidTribitsUsage.cmake b/tribits/core/package_arch/TribitsReportInvalidTribitsUsage.cmake
@@ -37,11 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-if (__TribitsReportInvalidTribitsUsage_INCLUDED__)
-  return()
-else()
-  set(__TribitsReportInvalidTribitsUsage_INCLUDED__ TRUE)
-endif()
+include_guard()
 
 include(MessageWrapper)
 

diff --git a/tribits/core/package_arch/TribitsTplFindIncludeDirsAndLibraries.cmake b/tribits/core/package_arch/TribitsTplFindIncludeDirsAndLibraries.cmake
@@ -37,11 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-if (TribitsTplFindIncludeDirsAndLibraries_INCLUDED)
-  return()
-else()
-  set(TribitsTplFindIncludeDirsAndLibraries_INCLUDED TRUE)
-endif()
+include_guard()
 
 include(AdvancedSet)
 include(AppendSet)

diff --git a/tribits/core/utils/MessageWrapper.cmake b/tribits/core/utils/MessageWrapper.cmake
@@ -37,14 +37,10 @@
 # ************************************************************************
 # @HEADER
 
-if (MESSAGE_WRAPPER_INCLUDED)
-  return()
-endif()
-set(MESSAGE_WRAPPER_INCLUDED TRUE)
+include_guard()
 
 include(GlobalSet)
 
-#
 # @FUNCTION: message_wrapper()
 #
 # Function that wraps the standard CMake/CTest ``message()`` function call in

diff --git a/tribits/core/utils/PrintVar.cmake b/tribits/core/utils/PrintVar.cmake
@@ -37,12 +37,8 @@
 # ************************************************************************
 # @HEADER
 
-if (PRINT_VAR_INCLUDED)
-  return()
-endif()
-set(PRINT_VAR_INCLUDED TRUE)
+include_guard()
 
-#
 # @FUNCTION: print_var()
 #
 # Unconditionally print a variable giving its name then value.