[Cmake-commits] [cmake-commits] alex committed cmExtraEclipseCDT4Generator.cxx 1.14 1.15

[cmake-commits at cmake.org]

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

Modified Files:
	cmExtraEclipseCDT4Generator.cxx 
Log Message:
BUG: don't crash in the generator is EXECUTABLE_OUTPUT_PATH or
LIBRARY_OUTPUT_PATH are empty

Alex


Index: cmExtraEclipseCDT4Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraEclipseCDT4Generator.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** cmExtraEclipseCDT4Generator.cxx	3 Apr 2008 22:43:43 -0000	1.14
--- cmExtraEclipseCDT4Generator.cxx	6 Aug 2008 19:35:52 -0000	1.15
***************
*** 352,356 ****
        }
      // for EXECUTABLE_OUTPUT_PATH when not in binary dir
!     std::string outputPath = mf->GetDefinition("EXECUTABLE_OUTPUT_PATH");
      if (!outputPath.empty() && !cmSystemTools::IsSubDirectory(
                          outputPath.c_str(), this->HomeOutputDirectory.c_str()))
--- 352,356 ----
        }
      // for EXECUTABLE_OUTPUT_PATH when not in binary dir
!     std::string outputPath = mf->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH");
      if (!outputPath.empty() && !cmSystemTools::IsSubDirectory(
                          outputPath.c_str(), this->HomeOutputDirectory.c_str()))
***************
*** 369,375 ****
        }
      // for LIBRARY_OUTPUT_PATH when not in binary dir
!     if (outputPath != mf->GetDefinition("LIBRARY_OUTPUT_PATH"))
        {
!       outputPath = mf->GetDefinition("LIBRARY_OUTPUT_PATH");
        if (!outputPath.empty() && !cmSystemTools::IsSubDirectory(
                          outputPath.c_str(), this->HomeOutputDirectory.c_str()))
--- 369,375 ----
        }
      // for LIBRARY_OUTPUT_PATH when not in binary dir
!     if (outputPath != mf->GetSafeDefinition("LIBRARY_OUTPUT_PATH"))
        {
!       outputPath = mf->GetSafeDefinition("LIBRARY_OUTPUT_PATH");
        if (!outputPath.empty() && !cmSystemTools::IsSubDirectory(
                          outputPath.c_str(), this->HomeOutputDirectory.c_str()))