Remove prefix for warning guard

There was never really a need to prefix this normal variable and the prefix just made the identifier unnecessarily long.
friendlyanon · Nov 6, 2021 · bd82f35 · bd82f35
1 parent 7772132
commit bd82f35
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/cmake-init/templates/c/executable/CMakeLists.txt b/cmake-init/templates/c/executable/CMakeLists.txt
@@ -23,7 +23,7 @@ add_library(
 )
 
 target_include_directories(
-    %(name)s_lib ${%(name)s_warning_guard}
+    %(name)s_lib ${warning_guard}
     PUBLIC
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/source>"
 )

diff --git a/cmake-init/templates/c/header/CMakeLists.txt b/cmake-init/templates/c/header/CMakeLists.txt
@@ -26,7 +26,7 @@ set_property(
 )
 
 target_include_directories(
-    %(name)s_%(name)s ${%(name)s_warning_guard}
+    %(name)s_%(name)s ${warning_guard}
     INTERFACE
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
 )

diff --git a/cmake-init/templates/c/shared/CMakeLists.txt b/cmake-init/templates/c/shared/CMakeLists.txt
@@ -44,7 +44,7 @@ set_target_properties(
 )
 
 target_include_directories(
-    %(name)s_%(name)s ${%(name)s_warning_guard}
+    %(name)s_%(name)s ${warning_guard}
     PUBLIC
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
 )

diff --git a/cmake-init/templates/common/cmake/variables.cmake b/cmake-init/templates/common/cmake/variables.cmake
@@ -23,7 +23,7 @@ endif()
 # to omit warnings from the provided paths, if the compiler supports that
 # This is to provide a user experience similar to find_package when
 # add_subdirectory or FetchContent is used to consume this project
-set(%(name)s_warning_guard "")
+set(warning_guard "")
 if(NOT PROJECT_IS_TOP_LEVEL)
   option(
       %(name)s_INCLUDES_WITH_SYSTEM
@@ -32,6 +32,6 @@ if(NOT PROJECT_IS_TOP_LEVEL)
   )
   mark_as_advanced(%(name)s_INCLUDES_WITH_SYSTEM)
   if(%(name)s_INCLUDES_WITH_SYSTEM)
-    set(%(name)s_warning_guard SYSTEM)
+    set(warning_guard SYSTEM)
   endif()
 endif()
diff --git a/cmake-init/templates/executable/CMakeLists.txt b/cmake-init/templates/executable/CMakeLists.txt
@@ -23,7 +23,7 @@ add_library(
 )
 
 target_include_directories(
-    %(name)s_lib ${%(name)s_warning_guard}
+    %(name)s_lib ${warning_guard}
     PUBLIC
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/source>"
 )

diff --git a/cmake-init/templates/header/CMakeLists.txt b/cmake-init/templates/header/CMakeLists.txt
@@ -26,7 +26,7 @@ set_property(
 )
 
 target_include_directories(
-    %(name)s_%(name)s ${%(name)s_warning_guard}
+    %(name)s_%(name)s ${warning_guard}
     INTERFACE
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
 )

diff --git a/cmake-init/templates/shared/CMakeLists.txt b/cmake-init/templates/shared/CMakeLists.txt
@@ -46,7 +46,7 @@ set_target_properties(
 )
 
 target_include_directories(
-    %(name)s_%(name)s ${%(name)s_warning_guard}
+    %(name)s_%(name)s ${warning_guard}
     PUBLIC
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
 )