mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 21:30:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'xl-fortran-module-dir-use'

Browse Source 
92785ed746 Tests: Enable Fortran submodule tests on XL compilers
210b0b99a9 XL: Fix using Fortran modules from their output directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4405
This commit is contained in:
Brad King
2020-03-02 15:47:44 +00:00
committed by Kitware Robot
parent 813b505c67 92785ed746
commit 178a166ae1
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmLocalCommonGenerator.cxx
+9
View File
@@ -50,6 +50,15 @@ std::string cmLocalCommonGenerator::GetTargetFortranFlags(
this->Makefile->GetRequiredDefinition("CMAKE_Fortran_MODDIR_FLAG"),
mod_dir);
this->AppendFlags(flags, modflag);
// Some compilers do not search their own module output directory
// for using other modules. Add an include directory explicitly
// for consistency with compilers that do search it.
std::string incflag =
this->Makefile->GetSafeDefinition("CMAKE_Fortran_MODDIR_INCLUDE_FLAG");
if (!incflag.empty()) {
incflag = cmStrCat(incflag, mod_dir);
this->AppendFlags(flags, incflag);
}
}
// If there is a separate module path flag then duplicate the