diff --git a/Source/cmCableCommand.cxx b/Source/cmCableCommand.cxx index 260be4ee5..df6b6e323 100644 --- a/Source/cmCableCommand.cxx +++ b/Source/cmCableCommand.cxx @@ -68,5 +68,7 @@ void cmCableCommand::SetupCableData() // We didn't find another cmCableCommand with a valid cmCableData. // We must allocate the new cmCableData ourselves, and with this // command as its owner. - m_CableData = new cmCableData(this); + std::string pathName = m_Makefile->GetStartOutputDirectory(); + pathName += "/cable_config.xml"; + m_CableData = new cmCableData(this, pathName); } diff --git a/Source/cmCableData.cxx b/Source/cmCableData.cxx index 02fd0f653..0e833ee2c 100644 --- a/Source/cmCableData.cxx +++ b/Source/cmCableData.cxx @@ -22,13 +22,14 @@ * The cmCableData instance is owned by one cmCableCommand, which is given * to this constructor. */ -cmCableData::cmCableData(const cmCableCommand* owner): +cmCableData::cmCableData(const cmCableCommand* owner, + const std::string& configurationFile): m_Owner(owner), m_Indentation(0), m_Package(NULL), m_PackageNamespaceDepth(0) { - this->OpenOutputFile("cable_config.xml"); + this->OpenOutputFile(configurationFile); } diff --git a/Source/cmCableData.h b/Source/cmCableData.h index 53ff41210..afa79856a 100644 --- a/Source/cmCableData.h +++ b/Source/cmCableData.h @@ -28,7 +28,7 @@ class cmCablePackageCommand; class cmCableData { public: - cmCableData(const cmCableCommand*); + cmCableData(const cmCableCommand*, const std::string&); ~cmCableData(); /**