diff options
Diffstat (limited to 'Source/cmFLTKWrapUICommand.cxx')
| -rw-r--r-- | Source/cmFLTKWrapUICommand.cxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/Source/cmFLTKWrapUICommand.cxx b/Source/cmFLTKWrapUICommand.cxx index ed8f70f..1252fe6 100644 --- a/Source/cmFLTKWrapUICommand.cxx +++ b/Source/cmFLTKWrapUICommand.cxx @@ -28,27 +28,27 @@ bool cmFLTKWrapUICommand::InitialPass(std::vector<std::string> const& args) } // what is the current source dir - std::string cdir = m_Makefile->GetCurrentDirectory(); + std::string cdir = this->Makefile->GetCurrentDirectory(); const char* fluid_exe = - m_Makefile->GetRequiredDefinition("FLTK_FLUID_EXECUTABLE"); + this->Makefile->GetRequiredDefinition("FLTK_FLUID_EXECUTABLE"); // get parameter for the command - m_Target = args[0]; // Target that will use the generated files + this->Target = args[0]; // Target that will use the generated files std::vector<std::string> newArgs; - m_Makefile->ExpandSourceListArguments(args,newArgs, 1); + this->Makefile->ExpandSourceListArguments(args,newArgs, 1); // get the list of GUI files from which .cxx and .h will be generated - std::string outputDirectory = m_Makefile->GetCurrentOutputDirectory(); + std::string outputDirectory = this->Makefile->GetCurrentOutputDirectory(); // Some of the generated files are *.h so the directory "GUI" // where they are created have to be added to the include path - m_Makefile->AddIncludeDirectory( outputDirectory.c_str() ); + this->Makefile->AddIncludeDirectory( outputDirectory.c_str() ); for(std::vector<std::string>::iterator i = (newArgs.begin() + 1); i != newArgs.end(); i++) { - cmSourceFile *curr = m_Makefile->GetSource(i->c_str()); + cmSourceFile *curr = this->Makefile->GetSource(i->c_str()); // if we should use the source GUI // to generate .cxx and .h files if (!curr || !curr->GetPropertyAsBool("WRAP_EXCLUDE")) @@ -82,24 +82,24 @@ bool cmFLTKWrapUICommand::InitialPass(std::vector<std::string> const& args) const char* no_main_dependency = 0; const char* no_comment = 0; const char* no_working_dir = 0; - m_Makefile->AddCustomCommandToOutput(cxxres.c_str(), + this->Makefile->AddCustomCommandToOutput(cxxres.c_str(), depends, no_main_dependency, commandLines, no_comment, no_working_dir); - m_Makefile->AddCustomCommandToOutput(hname.c_str(), + this->Makefile->AddCustomCommandToOutput(hname.c_str(), depends, no_main_dependency, commandLines, no_comment, no_working_dir); - cmSourceFile *sf = m_Makefile->GetSource(cxxres.c_str()); + cmSourceFile *sf = this->Makefile->GetSource(cxxres.c_str()); sf->GetDepends().push_back(hname); sf->GetDepends().push_back(origname); - m_GeneratedSourcesClasses.push_back(sf); + this->GeneratedSourcesClasses.push_back(sf); } } // create the variable with the list of sources in it - size_t lastHeadersClass = m_GeneratedSourcesClasses.size(); + size_t lastHeadersClass = this->GeneratedSourcesClasses.size(); std::string sourceListValue; for(size_t classNum = 0; classNum < lastHeadersClass; classNum++) { @@ -107,11 +107,11 @@ bool cmFLTKWrapUICommand::InitialPass(std::vector<std::string> const& args) { sourceListValue += ";"; } - sourceListValue += m_GeneratedSourcesClasses[classNum]->GetFullPath(); + sourceListValue += this->GeneratedSourcesClasses[classNum]->GetFullPath(); } - std::string varName = m_Target; + std::string varName = this->Target; varName += "_FLTK_UI_SRCS"; - m_Makefile->AddDefinition(varName.c_str(), sourceListValue.c_str()); + this->Makefile->AddDefinition(varName.c_str(), sourceListValue.c_str()); return true; } @@ -122,12 +122,12 @@ void cmFLTKWrapUICommand::FinalPass() // 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<std::string> srcs = - m_Makefile->GetTargets()[m_Target].GetSourceLists(); + this->Makefile->GetTargets()[this->Target].GetSourceLists(); bool found = false; for (unsigned int i = 0; i < srcs.size(); ++i) { if (srcs[i] == - m_GeneratedSourcesClasses[0]->GetFullPath()) + this->GeneratedSourcesClasses[0]->GetFullPath()) { found = true; break; @@ -137,16 +137,16 @@ void cmFLTKWrapUICommand::FinalPass() { std::string msg = "In CMake 2.2 the FLTK_WRAP_UI command sets a variable to the list of source files that should be added to your executable or library. It appears that you have not added these source files to your target. You should change your CMakeLists.txt file to directly add the generated files to the target. For example FTLK_WRAP_UI(foo src1 src2 src3) will create a variable named foo_FLTK_UI_SRCS that contains the list of sources to add to your target when you call ADD_LIBRARY or ADD_EXECUTABLE. For now CMake 2.2 will add the sources to your target for you as was done in CMake 2.0 and earlier. In the future this may become an error. "; msg += "The problem was found while processing the source directory: "; - msg += m_Makefile->GetStartDirectory(); + msg += this->Makefile->GetStartDirectory(); cmSystemTools::Message(msg.c_str(),"Warning"); // first we add the rules for all the .fl to .h and .cxx files - size_t lastHeadersClass = m_GeneratedSourcesClasses.size(); + size_t lastHeadersClass = this->GeneratedSourcesClasses.size(); // Generate code for all the .fl files for(size_t classNum = 0; classNum < lastHeadersClass; classNum++) { - m_Makefile->GetTargets()[m_Target].GetSourceFiles().push_back( - m_GeneratedSourcesClasses[classNum]); + this->Makefile->GetTargets()[this->Target].GetSourceFiles().push_back( + this->GeneratedSourcesClasses[classNum]); } } } |