cmDependsFortran: Use string to store module directory
This commit is contained in:
parent
6d79eda769
commit
613bc08ac1
|
@ -154,14 +154,10 @@ bool cmDependsFortran::Finalize(std::ostream& makeDepends,
|
||||||
const char* stamp_dir = this->TargetDirectory.c_str();
|
const char* stamp_dir = this->TargetDirectory.c_str();
|
||||||
|
|
||||||
// Get the directory in which module files will be created.
|
// Get the directory in which module files will be created.
|
||||||
const char* mod_dir;
|
|
||||||
cmMakefile* mf = this->LocalGenerator->GetMakefile();
|
cmMakefile* mf = this->LocalGenerator->GetMakefile();
|
||||||
if(const char* target_mod_dir =
|
std::string mod_dir =
|
||||||
mf->GetDefinition("CMAKE_Fortran_TARGET_MODULE_DIR"))
|
mf->GetSafeDefinition("CMAKE_Fortran_TARGET_MODULE_DIR");
|
||||||
{
|
if (mod_dir.empty())
|
||||||
mod_dir = target_mod_dir;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
mod_dir =
|
mod_dir =
|
||||||
this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
|
this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
|
||||||
|
@ -356,7 +352,8 @@ bool
|
||||||
cmDependsFortran
|
cmDependsFortran
|
||||||
::WriteDependenciesReal(const char *obj,
|
::WriteDependenciesReal(const char *obj,
|
||||||
cmFortranSourceInfo const& info,
|
cmFortranSourceInfo const& info,
|
||||||
const char* mod_dir, const char* stamp_dir,
|
std::string const& mod_dir,
|
||||||
|
const char* stamp_dir,
|
||||||
std::ostream& makeDepends,
|
std::ostream& makeDepends,
|
||||||
std::ostream& internalDepends)
|
std::ostream& internalDepends)
|
||||||
{
|
{
|
||||||
|
|
|
@ -66,7 +66,8 @@ protected:
|
||||||
// Actually write the depenencies to the streams.
|
// Actually write the depenencies to the streams.
|
||||||
bool WriteDependenciesReal(const char *obj,
|
bool WriteDependenciesReal(const char *obj,
|
||||||
cmFortranSourceInfo const& info,
|
cmFortranSourceInfo const& info,
|
||||||
const char* mod_dir, const char* stamp_dir,
|
std::string const& mod_dir,
|
||||||
|
const char* stamp_dir,
|
||||||
std::ostream& makeDepends,
|
std::ostream& makeDepends,
|
||||||
std::ostream& internalDepends);
|
std::ostream& internalDepends);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue