[cmake-commits] king committed CMakeLists.txt 1.59 1.60 complex.cxx 1.91 1.92

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/Complex/Executable
In directory public:/mounts/ram/cvs-serv24559/Tests/Complex/Executable

Modified Files:
	CMakeLists.txt complex.cxx 
Log Message:
BUG: Fixed cmLocalVisualStudio7Generator to deal with quotes in macro definitions properly.  This addresses bug#4983.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Complex/Executable/CMakeLists.txt,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- CMakeLists.txt	1 Feb 2007 17:02:24 -0000	1.59
+++ CMakeLists.txt	9 May 2007 14:18:31 -0000	1.60
@@ -87,7 +87,8 @@
                         "${Complex_BINARY_DIR}/Executable/postbuild2.txt")
 
 SET_SOURCE_FILES_PROPERTIES(complex
-  COMPILE_FLAGS "-DFILE_HAS_EXTRA_COMPILE_FLAGS"
+  COMPILE_FLAGS
+  "-DFILE_HAS_EXTRA_COMPILE_FLAGS -DFILE_DEFINE_STRING=\\\"hello\\\""
   OBJECT_DEPENDS ${Complex_BINARY_DIR}/cmTestGeneratedHeader.h
 )
 SET_TARGET_PROPERTIES(complex PROPERTIES COMPILE_FLAGS "-DCOMPLEX_TARGET_FLAG")

Index: complex.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Complex/Executable/complex.cxx,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- complex.cxx	12 Mar 2007 14:23:05 -0000	1.91
+++ complex.cxx	9 May 2007 14:18:31 -0000	1.92
@@ -1139,6 +1139,19 @@
   cmPassed("SET_SOURCE_FILES_PROPERTIES succeeded in setting FILE_HAS_EXTRA_COMPILE_FLAGS flag");
 #endif
 
+#ifndef FILE_DEFINE_STRING
+  cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting FILE_DEFINE_STRING flag");
+#else
+  if(strcmp(FILE_DEFINE_STRING, "hello") != 0)
+    {
+    cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting FILE_DEFINE_STRING flag correctly");
+    }
+  else
+    {
+    cmPassed("SET_SOURCE_FILES_PROPERTIES succeeded in setting FILE_DEFINE_STRING flag");
+    }
+#endif
+
 #ifndef FILE_HAS_ABSTRACT
   cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting ABSTRACT flag");
 #else