[cmake-commits] king committed InputFile.h.in 1.2 1.3 StringFile.cxx 1.4 1.5

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/StringFileTest
In directory public:/mounts/ram/cvs-serv4731/Tests/StringFileTest

Modified Files:
	InputFile.h.in StringFile.cxx 
Log Message:
BUG: Fixed @ONLY configuration to not try to parse ${} syntax at all.  This fixes the original fix to bug#4393 and adds a test.


Index: InputFile.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/StringFileTest/InputFile.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- InputFile.h.in	4 Mar 2004 15:05:14 -0000	1.2
+++ InputFile.h.in	6 Jun 2007 20:20:02 -0000	1.3
@@ -5,6 +5,10 @@
 /* This should be configured to a commented undef with the curlies in place */
 #cmakedefine TEST_NOT_DEFINED ${TEST_NOT_DEFINED} 
 
+/* This complicated line should be configured unchanged: */
+static const char* configvar =
+"@$@$junk =~ s/#$xyz#/$foo_bar{$wibble}->{$xyz}/;@@";
+
 int CheckMethod(const char* var, const char* val )
 {
   if ( !var )

Index: StringFile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/StringFileTest/StringFile.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- StringFile.cxx	17 Oct 2005 13:56:42 -0000	1.4
+++ StringFile.cxx	6 Jun 2007 20:20:02 -0000	1.5
@@ -24,6 +24,8 @@
   res += CheckMethod(tuvar, "CMAKE");
   res += CheckMethod(tlvar, "cmake");
   res += CheckMethod(relpath, "../../X11R6/bin/xnest");
+  res += CheckMethod(configvar,
+                     "@$@$junk =~ s/#$xyz#/$foo_bar{$wibble}->{$xyz}/;@@");
   
   return res;
 }