This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 5ddcbbbcb8d99efd9b9a43e6b20654af4a791c12 (commit)
via f831d752aeb3000a9b1b686da986af7ffecb6968 (commit)
from 70ae13e6720ca49711c2afa36fcc7e036bd91432 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ddcbbbcb8d99efd9b9a43e6b20654af4a791c12
commit 5ddcbbbcb8d99efd9b9a43e6b20654af4a791c12
Merge: 70ae13e f831d75
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Apr 5 13:12:08 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Apr 5 13:12:08 2016 -0400
Merge topic 'fortran-line-directives-no-dirs' into next
f831d752 cmFortranParser: Skip #line directives that do not name files
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f831d752aeb3000a9b1b686da986af7ffecb6968
commit f831d752aeb3000a9b1b686da986af7ffecb6968
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Apr 5 12:57:15 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Apr 5 12:59:45 2016 -0400
cmFortranParser: Skip #line directives that do not name files
Since commit v3.5.0-rc1~241^2~1 (cmFortranParser: Parse #line
directives, 2015-11-02) our Fortran dependency scanner parses `#line`
directives to extract the named files. However, some compilers produce
`#line` directives that name directories instead of files. Work around
such cases by verifying that the extracted path names a file and not a
directory.
diff --git a/Source/cmFortranParserImpl.cxx b/Source/cmFortranParserImpl.cxx
index c175e62..b3b2f16 100644
--- a/Source/cmFortranParserImpl.cxx
+++ b/Source/cmFortranParserImpl.cxx
@@ -229,7 +229,7 @@ void cmFortranParser_RuleLineDirective(cmFortranParser*
parser,
cmSystemTools::ConvertToUnixSlashes(included);
// Save the named file as included in the source.
- if (cmSystemTools::FileExists(included))
+ if (cmSystemTools::FileExists(included, true))
{
parser->Info.Includes.insert(included);
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmFortranParserImpl.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
