[Cmake-commits] [cmake-commits] hoffman committed cmMakefile.cxx 1.473 1.474

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv12586

Modified Files:
	cmMakefile.cxx 
Log Message:
BUG: fix for bug 7239, DEFINITIONS property not backwards compatible to 2.4


Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.473
retrieving revision 1.474
diff -C 2 -d -r1.473 -r1.474
*** cmMakefile.cxx	4 Jun 2008 16:10:52 -0000	1.473
--- cmMakefile.cxx	25 Jun 2008 13:44:56 -0000	1.474
***************
*** 2955,2960 ****
      }
    else if (!strcmp("DEFINITIONS",prop))
!     {
!     output = this->GetDefineFlags();
      return output.c_str();
      }
--- 2955,2973 ----
      }
    else if (!strcmp("DEFINITIONS",prop))
!     { 
!     if(const char* cdefs = this->GetProperty("COMPILE_DEFINITIONS"))
!       {
!       // Expand the list.
!       std::vector<std::string> defs;
!       cmSystemTools::ExpandListArgument(cdefs, defs);
!       for(std::vector<std::string>::iterator i = defs.begin();
!           i != defs.end(); ++i)
!         {
!         output += "-D";
!         output += *i;
!         output += " ";
!         }
!       }
!     output += this->GetDefineFlags();
      return output.c_str();
      }