diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-30 13:56:16 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-07-30 13:56:16 (GMT) |
| commit | a8c3698526cfa11c61d9dfd8c0f9fa8d2c7ff10a (patch) | |
| tree | 2a1143da7e12a901883603a8211c19dd07820ec8 /Source/cmMakefileTargetGenerator.cxx | |
| parent | 7e27a42ebde342cc78dc5e3ae8b03f152eab498a (diff) | |
| parent | e90372a0db3248d4b78d8d7d7020c66cb5dc3803 (diff) | |
| download | CMake-a8c3698526cfa11c61d9dfd8c0f9fa8d2c7ff10a.zip CMake-a8c3698526cfa11c61d9dfd8c0f9fa8d2c7ff10a.tar.gz CMake-a8c3698526cfa11c61d9dfd8c0f9fa8d2c7ff10a.tar.bz2 | |
Merge topic 'refactor-fortran-module-directory'
e90372a0 cmCommonTargetGenerator: Factor out Fortran module directory computation
70c21301 cmCommonTargetGenerator: Store working directory for relative paths
7371d8f3 cmCommonTargetGenerator: Return string from GetFortranModuleDirectory
613bc08a cmDependsFortran: Use string to store module directory
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 0bf3764..5edc0f5 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -33,7 +33,7 @@ #include <ctype.h> cmMakefileTargetGenerator::cmMakefileTargetGenerator(cmGeneratorTarget* target) - : cmCommonTargetGenerator(target) + : cmCommonTargetGenerator(cmOutputConverter::START_OUTPUT, target) , OSXBundleGenerator(0) , MacOSXContentGenerator(0) { @@ -1068,14 +1068,11 @@ void cmMakefileTargetGenerator::WriteTargetDependRules() << " )\n"; } - // Check for a target-specific module output directory. - if(const char* mdir = this->GetFortranModuleDirectory()) - { - *this->InfoFileStream - << "\n" - << "# Fortran module output directory.\n" - << "set(CMAKE_Fortran_TARGET_MODULE_DIR \"" << mdir << "\")\n"; - } + *this->InfoFileStream + << "\n" + << "# Fortran module output directory.\n" + << "set(CMAKE_Fortran_TARGET_MODULE_DIR \"" + << this->GetFortranModuleDirectory() << "\")\n"; // and now write the rule to use it std::vector<std::string> depends; |