summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorTim Gallagher <tim.gallagher@gatech.edu>2014-11-05 18:43:06 (GMT)
committerBrad King <brad.king@kitware.com>2014-11-10 15:24:53 (GMT)
commitb6b37e303786e48c305cb83011ce5fa6cf71e359 (patch)
treeceb9d6e82793804a1adc0f079de8317dd0f37695 /Source
parent0842b08463d14d6c7e27dcb4cda278805cce6e5f (diff)
downloadCMake-b6b37e303786e48c305cb83011ce5fa6cf71e359.zip
CMake-b6b37e303786e48c305cb83011ce5fa6cf71e359.tar.gz
CMake-b6b37e303786e48c305cb83011ce5fa6cf71e359.tar.bz2
Makefile: Add assembly and preprocessed targets for Fortran
Extend the FortranOnly test to cover "make <src>.i" targets.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx5
-rw-r--r--Source/cmMakefileTargetGenerator.cxx5
2 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 0e40c04..ff8ba8b 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -322,9 +322,10 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
lo->second.begin(); ei != lo->second.end(); ++ei)
{
if(ei->Language == "C" ||
- ei->Language == "CXX")
+ ei->Language == "CXX" ||
+ ei->Language == "Fortran")
{
- // Right now, C and C++ have both a preprocessor and the
+ // Right now, C, C++ and Fortran have both a preprocessor and the
// ability to generate assembly code
lang_has_preprocessor = true;
lang_has_assembly = true;
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index a1f4141..1e01f11 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -702,11 +702,12 @@ cmMakefileTargetGenerator
vars.Defines = definesString.c_str();
- // At the moment, it is assumed that C and C++ have both
+ // At the moment, it is assumed that C, C++, and Fortran have both
// assembly and preprocessor capabilities. The same is true for the
// ability to export compile commands
bool lang_has_preprocessor = ((lang == "C") ||
- (lang == "CXX"));
+ (lang == "CXX") ||
+ (lang == "Fortran"));
bool const lang_has_assembly = lang_has_preprocessor;
bool const lang_can_export_cmds = lang_has_preprocessor;