summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2004-08-05 15:51:49 (GMT)
committerBrad King <brad.king@kitware.com>2004-08-05 15:51:49 (GMT)
commit337103828314be9eefa8cafeb1def915ae7072be (patch)
tree8e1f4fb89818045fce6604015acb2f94d320976e
parent46418e70a3a20744ad7ede40bfdbc41a67646831 (diff)
downloadCMake-337103828314be9eefa8cafeb1def915ae7072be.zip
CMake-337103828314be9eefa8cafeb1def915ae7072be.tar.gz
CMake-337103828314be9eefa8cafeb1def915ae7072be.tar.bz2
ERR: Replacing hack call to CONFIGURE_FILE command with direct call to m_Makefile->ConfigureFile.
-rw-r--r--Source/cmAddExecutableCommand.cxx8
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx
index 8faabac..6e3e680 100644
--- a/Source/cmAddExecutableCommand.cxx
+++ b/Source/cmAddExecutableCommand.cxx
@@ -59,8 +59,6 @@ bool cmAddExecutableCommand::InitialPass(std::vector<std::string> const& args)
{
tgt->SetProperty("MACOSX_BUNDLE", "ON");
#ifdef __APPLE__
- cmListFileFunction func;
- func.m_Name = "CONFIGURE_FILE";
std::string f1 = m_Makefile->GetModulesFile("MacOSXBundleInfo.plist.in");
if ( f1.size() == 0 )
{
@@ -80,12 +78,8 @@ bool cmAddExecutableCommand::InitialPass(std::vector<std::string> const& args)
std::string f2 = macdir + "Info.plist";
macdir += "MacOS";
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->ExecuteCommand(func);
+ m_Makefile->ConfigureFile(f1.c_str(), f2.c_str(), false, false, false);
#endif
}