parent
b1686031e4
commit
eb91859d6f
|
@ -390,8 +390,6 @@ int cmCPackGenerator::InstallProjectViaInstallScript(
|
||||||
{
|
{
|
||||||
const char* cmakeScripts
|
const char* cmakeScripts
|
||||||
= this->GetOption("CPACK_INSTALL_SCRIPT");
|
= this->GetOption("CPACK_INSTALL_SCRIPT");
|
||||||
std::string currentWorkingDirectory =
|
|
||||||
cmSystemTools::GetCurrentWorkingDirectory();
|
|
||||||
if ( cmakeScripts && *cmakeScripts )
|
if ( cmakeScripts && *cmakeScripts )
|
||||||
{
|
{
|
||||||
cmCPackLogger(cmCPackLog::LOG_OUTPUT,
|
cmCPackLogger(cmCPackLog::LOG_OUTPUT,
|
||||||
|
@ -460,8 +458,6 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
|
||||||
= this->GetOption("CPACK_INSTALL_CMAKE_PROJECTS");
|
= this->GetOption("CPACK_INSTALL_CMAKE_PROJECTS");
|
||||||
const char* cmakeGenerator
|
const char* cmakeGenerator
|
||||||
= this->GetOption("CPACK_CMAKE_GENERATOR");
|
= this->GetOption("CPACK_CMAKE_GENERATOR");
|
||||||
std::string currentWorkingDirectory =
|
|
||||||
cmSystemTools::GetCurrentWorkingDirectory();
|
|
||||||
if ( cmakeProjects && *cmakeProjects )
|
if ( cmakeProjects && *cmakeProjects )
|
||||||
{
|
{
|
||||||
if ( !cmakeGenerator )
|
if ( !cmakeGenerator )
|
||||||
|
|
|
@ -576,9 +576,6 @@ cmMakefileTargetGenerator
|
||||||
sourceFile = this->Convert(sourceFile.c_str(),
|
sourceFile = this->Convert(sourceFile.c_str(),
|
||||||
cmLocalGenerator::NONE,
|
cmLocalGenerator::NONE,
|
||||||
cmLocalGenerator::SHELL);
|
cmLocalGenerator::SHELL);
|
||||||
std::string objectFile = this->Convert(obj.c_str(),
|
|
||||||
cmLocalGenerator::START_OUTPUT,
|
|
||||||
cmLocalGenerator::SHELL);
|
|
||||||
|
|
||||||
// Construct the build message.
|
// Construct the build message.
|
||||||
std::vector<std::string> no_commands;
|
std::vector<std::string> no_commands;
|
||||||
|
|
Loading…
Reference in New Issue