summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2001-02-13 21:48:00 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2001-02-13 21:48:00 (GMT)
commitdd36c5f29649bb33c634822cedf901c356fdc544 (patch)
tree6e482878be98936703ddfb634389be7ba60049e2
parentdb267f533b9ac63db78559e9d3cb39a6db090770 (diff)
downloadCMake-dd36c5f29649bb33c634822cedf901c356fdc544.zip
CMake-dd36c5f29649bb33c634822cedf901c356fdc544.tar.gz
CMake-dd36c5f29649bb33c634822cedf901c356fdc544.tar.bz2
ENH: add configure style @var@ expansion
-rw-r--r--Source/cmMakefile.cxx5
-rw-r--r--Source/cmMakefile.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 5a7fa6d..ec6c2d4 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -397,6 +397,11 @@ void cmMakefile::ExpandVariblesInString(std::string& source)
variable += "}";
cmSystemTools::ReplaceString(source, variable.c_str(),
(*i).second.c_str());
+ variable = "@";
+ variable += (*i).first;
+ variable += "@";
+ cmSystemTools::ReplaceString(source, variable.c_str(),
+ (*i).second.c_str());
}
}
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index ff16c9d..2e8b39a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -310,7 +310,8 @@ public:
* Expand all defined varibles in the string.
* Defined varibles come from the m_Definitions map.
* They are expanded with ${var} where var is the
- * entry in the m_Definitions map.
+ * entry in the m_Definitions map. Also @var@ is
+ * expanded to match autoconf style expansions.
*/
void ExpandVariblesInString(std::string& source);
protected: