[Cmake-commits] CMake branch, next, updated. v3.1.0-1388-g659c3ac

[Brad King]

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  659c3ac9500c56c2f66302775f2d6a71ba87e943 (commit)
       via  be1109d811a637f03328d97a3cacfb9dad273744 (commit)
      from  e0a5d8f871bccbc5bcf4460778fd5bdfbf1957e3 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=659c3ac9500c56c2f66302775f2d6a71ba87e943
commit 659c3ac9500c56c2f66302775f2d6a71ba87e943
Merge: e0a5d8f be1109d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 23 10:21:14 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 23 10:21:14 2014 -0500

    Merge topic 'sunpro-Fortran-preprocess' into next
    
    be1109d8 Oracle/Sun: Fix Fortran preprocessor rule generation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be1109d811a637f03328d97a3cacfb9dad273744
commit be1109d811a637f03328d97a3cacfb9dad273744
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 23 10:14:12 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 23 10:15:27 2014 -0500

    Oracle/Sun: Fix Fortran preprocessor rule generation
    
    The SunPro Fortran compiler uses "-F" instead of "-E" to request
    preprocessing.  The output does not go to stdout so use "-o" to
    specify the output file.
    
    This fixes the guess originally made by commit b6b37e30 (Makefile: Add
    assembly and preprocessed targets for Fortran, 2014-11-05).

diff --git a/Modules/Compiler/SunPro-Fortran.cmake b/Modules/Compiler/SunPro-Fortran.cmake
index c38d5a5..e4db1e8 100644
--- a/Modules/Compiler/SunPro-Fortran.cmake
+++ b/Modules/Compiler/SunPro-Fortran.cmake
@@ -17,5 +17,5 @@ set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-g -xO2 -DNDEBUG")
 set(CMAKE_Fortran_MODDIR_FLAG "-moddir=")
 set(CMAKE_Fortran_MODPATH_FLAG "-M")
 
-set(CMAKE_Fortran_CREATE_PREPROCESSED_SOURCE "<CMAKE_Fortran_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
+set(CMAKE_Fortran_CREATE_PREPROCESSED_SOURCE "<CMAKE_Fortran_COMPILER> <DEFINES> <FLAGS> -F <SOURCE> -o <PREPROCESSED_SOURCE>")
 set(CMAKE_Fortran_CREATE_ASSEMBLY_SOURCE "<CMAKE_Fortran_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")

-----------------------------------------------------------------------

Summary of changes:
 Modules/Compiler/SunPro-Fortran.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake