diff options
| author | Brad King <brad.king@kitware.com> | 2001-03-02 17:27:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2001-03-02 17:27:41 (GMT) |
| commit | b6d1cda20e7d9b8d412a7281acb9157cff9cd362 (patch) | |
| tree | b28834bb088eb7d5090581fa5cbe173161e6da7c | |
| parent | dc72655414eb8a611524b6480dad92d46b08fecb (diff) | |
| download | CMake-b6d1cda20e7d9b8d412a7281acb9157cff9cd362.zip CMake-b6d1cda20e7d9b8d412a7281acb9157cff9cd362.tar.gz CMake-b6d1cda20e7d9b8d412a7281acb9157cff9cd362.tar.bz2 | |
ENH: CABLE config file (config_cable.xml) should now be opened in the output directory.
| -rw-r--r-- | Source/cmCableCommand.cxx | 4 | ||||
| -rw-r--r-- | Source/cmCableData.cxx | 5 | ||||
| -rw-r--r-- | Source/cmCableData.h | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmCableCommand.cxx b/Source/cmCableCommand.cxx index 260be4e..df6b6e3 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 02fd0f6..0e833ee 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 53ff412..afa7985 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(); /** |