[Cmake-commits] [cmake-commits] hoffman committed cmMakefile.cxx 1.490 1.491

cmake-commits at cmake.org cmake-commits at cmake.org
Sun Jan 18 12:05:47 EST 2009


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

Modified Files:
	cmMakefile.cxx 
Log Message:
BUG: fix crash with empty properties


Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.490
retrieving revision 1.491
diff -C 2 -d -r1.490 -r1.491
*** cmMakefile.cxx	15 Jan 2009 19:37:08 -0000	1.490
--- cmMakefile.cxx	18 Jan 2009 17:05:45 -0000	1.491
***************
*** 2916,2920 ****
      {
      std::vector<std::string> varArgsExpanded;
!     cmSystemTools::ExpandListArgument(value, varArgsExpanded);
      this->SetIncludeDirectories(varArgsExpanded);
      return;
--- 2916,2923 ----
      {
      std::vector<std::string> varArgsExpanded;
!     if(value)
!       {
!       cmSystemTools::ExpandListArgument(value, varArgsExpanded);
!       }
      this->SetIncludeDirectories(varArgsExpanded);
      return;
***************
*** 2924,2928 ****
      {
      std::vector<std::string> varArgsExpanded;
!     cmSystemTools::ExpandListArgument(value, varArgsExpanded);
      this->SetLinkDirectories(varArgsExpanded);
      return;
--- 2927,2934 ----
      {
      std::vector<std::string> varArgsExpanded;
!     if(value)
!       {
!       cmSystemTools::ExpandListArgument(value, varArgsExpanded);
!       }
      this->SetLinkDirectories(varArgsExpanded);
      return;



More information about the Cmake-commits mailing list