BUG: Fixed @ONLY configuration to not try to parse ${} syntax at all. This fixes the original fix to bug#4393 and adds a test.

1 files changed, 3 insertions, 2 deletions

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 0c4341a..93b8f02 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -570,14 +570,14 @@ public:
    * entry in the this->Definitions map.  Also @var@ is
    * expanded to match autoconf style expansions.
    */
-  const char *ExpandVariablesInString(std::string& source) const;
+  const char *ExpandVariablesInString(std::string& source);
   const char *ExpandVariablesInString(std::string& source, bool escapeQuotes,
                                       bool noEscapes,
                                       bool atOnly = false,
                                       const char* filename = 0,
                                       long line = -1,
                                       bool removeEmpty = false,
-                                      bool replaceAt = true) const;
+                                      bool replaceAt = true);
 
   /**
    * Remove any remaining variables in the string. Anything with ${var} or
@@ -807,6 +807,7 @@ private:
 
   cmsys::RegularExpression cmDefineRegex;
   cmsys::RegularExpression cmDefine01Regex;
+  cmsys::RegularExpression cmAtVarRegex;
 
   cmPropertyMap Properties;