kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ERR: Replacing hack call to CONFIGURE_FILE command with direct call to m_Makefile->ConfigureFile.

Browse Source
This commit is contained in:
Brad King 2004-08-05 11:51:49 -04:00
parent 46418e70a3
commit 3371038283
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmAddExecutableCommand.cxx
View File

@ -59,8 +59,6 @@ bool cmAddExecutableCommand::InitialPass(std::vector<std::string> const& args)
{ {
tgt->SetProperty("MACOSX_BUNDLE", "ON"); tgt->SetProperty("MACOSX_BUNDLE", "ON");
#ifdef __APPLE__ #ifdef __APPLE__
cmListFileFunction func;
func.m_Name = "CONFIGURE_FILE";
std::string f1 = m_Makefile->GetModulesFile("MacOSXBundleInfo.plist.in"); std::string f1 = m_Makefile->GetModulesFile("MacOSXBundleInfo.plist.in");
if ( f1.size() == 0 ) if ( f1.size() == 0 )
{ {
@ -80,12 +78,8 @@ bool cmAddExecutableCommand::InitialPass(std::vector<std::string> const& args)
std::string f2 = macdir + "Info.plist"; std::string f2 = macdir + "Info.plist";
macdir += "MacOS"; macdir += "MacOS";
cmSystemTools::MakeDirectory(macdir.c_str()); cmSystemTools::MakeDirectory(macdir.c_str());
func.m_Arguments.push_back(cmListFileArgument(f1, true));
func.m_Arguments.push_back(cmListFileArgument(f2, true));
func.m_Arguments.push_back(cmListFileArgument("IMMEDIATE", true));
m_Makefile->AddDefinition("MACOSX_BUNDLE_EXECUTABLE_NAME", exename.c_str()); m_Makefile->AddDefinition("MACOSX_BUNDLE_EXECUTABLE_NAME", exename.c_str());
m_Makefile->ExecuteCommand(func); m_Makefile->ConfigureFile(f1.c_str(), f2.c_str(), false, false, false);
#endif #endif
} }