[Cmake-commits] [cmake-commits] hoffman committed cmFLTKWrapUICommand.cxx 1.38 1.39

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Jun 23 11:08:59 EDT 2008


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

Modified Files:
	cmFLTKWrapUICommand.cxx 
Log Message:
BUG: fix for bug 7228 FLTK_WRAP_UI segfault fixed


Index: cmFLTKWrapUICommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFLTKWrapUICommand.cxx,v
retrieving revision 1.38
retrieving revision 1.39
diff -C 2 -d -r1.38 -r1.39
*** cmFLTKWrapUICommand.cxx	23 Jan 2008 15:27:59 -0000	1.38
--- cmFLTKWrapUICommand.cxx	23 Jun 2008 15:08:57 -0000	1.39
***************
*** 122,127 ****
    // didn't support that, so check and see if they added the files in and if
    // they didn;t then print a warning and add then anyhow
    std::vector<cmSourceFile*> const& srcs = 
!     this->Makefile->GetTargets()[this->Target].GetSourceFiles();
    bool found = false;
    for (unsigned int i = 0; i < srcs.size(); ++i)
--- 122,139 ----
    // didn't support that, so check and see if they added the files in and if
    // they didn;t then print a warning and add then anyhow
+   cmTarget* target = this->Makefile->FindTarget(this->Target.c_str());
+   if(!target)
+     {
+     std::string msg = 
+       "FLTK_WRAP_UI was called with a target that was never created: ";
+     msg += this->Target;
+     msg +=".  The problem was found while processing the source directory: ";
+     msg += this->Makefile->GetStartDirectory();
+     msg += ".  This FLTK_WRAP_UI call will be ignored.";
+     cmSystemTools::Message(msg.c_str(),"Warning");
+     return;
+     }
    std::vector<cmSourceFile*> const& srcs = 
!     target->GetSourceFiles();
    bool found = false;
    for (unsigned int i = 0; i < srcs.size(); ++i)



More information about the Cmake-commits mailing list