From 21c7bcd895ac296e5395503b590bc74ceb0520a8 Mon Sep 17 00:00:00 2001
From: randomguy3 <dev@randomguy3.me.uk>
Date: Tue, 16 May 2017 11:35:11 +0100
Subject: Fix CMake macro special variable usage (#216)

The argument-related variables in a macro body are not real variables,
but special substitutions. They cannot be directly referred to by name,
only expanded.
---
 cmake/utils.cmake | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/cmake/utils.cmake b/cmake/utils.cmake
index c1e3ab9..d039e5c 100644
--- a/cmake/utils.cmake
+++ b/cmake/utils.cmake
@@ -59,11 +59,13 @@ endmacro ()
 # variable. When gflags is a subproject of another project (GFLAGS_IS_SUBPROJECT),
 # the variable is not added to the CMake cache. Otherwise it is cached.
 macro (gflags_define type varname docstring default)
-  if (ARGC GREATER 5)
+  # note that ARGC must be expanded here, as it is not a "real" variable
+  # (see the CMake documentation for the macro command)
+  if ("${ARGC}" GREATER 5)
     message (FATAL_ERROR "gflags_variable: Too many macro arguments")
   endif ()
   if (NOT DEFINED GFLAGS_${varname})
-    if (GFLAGS_IS_SUBPROJECT AND ARGC EQUAL 5)
+    if (GFLAGS_IS_SUBPROJECT AND "${ARGC}" EQUAL 5)
       set (GFLAGS_${varname} "${ARGV4}")
     else ()
       set (GFLAGS_${varname} "${default}")
@@ -83,7 +85,9 @@ endmacro ()
 macro (gflags_property varname property value)
   gflags_is_cached (_cached ${varname})
   if (_cached)
-    if (property STREQUAL ADVANCED)
+    # note that property must be expanded here, as it is not a "real" variable
+    # (see the CMake documentation for the macro command)
+    if ("${property}" STREQUAL "ADVANCED")
       if (${value})
         mark_as_advanced (FORCE ${varname})
       else ()
-- 
cgit v1.2.3