[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-347-g7e884bd

[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  7e884bd6b39776622b1f1a405ac0809125d8205b (commit)
       via  1689752965905373b84d547658877e97469e8031 (commit)
      from  562a7b835a999921cc395c76fde720f94d0547a6 (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=7e884bd6b39776622b1f1a405ac0809125d8205b
commit 7e884bd6b39776622b1f1a405ac0809125d8205b
Merge: 562a7b8 1689752
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 6 09:48:05 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 6 09:48:05 2014 -0500

    Merge topic 'make-fortran-preprocessor-assembly-targets' into next
    
    16897529 XL: Disable preprocessor targets for Fortran


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1689752965905373b84d547658877e97469e8031
commit 1689752965905373b84d547658877e97469e8031
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 6 09:47:08 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 6 09:47:08 2014 -0500

    XL: Disable preprocessor targets for Fortran
    
    The compiler does not support the -E option for preprocessing.

diff --git a/Modules/Compiler/XL-Fortran.cmake b/Modules/Compiler/XL-Fortran.cmake
index dfe2166..ae9df4e 100644
--- a/Modules/Compiler/XL-Fortran.cmake
+++ b/Modules/Compiler/XL-Fortran.cmake
@@ -11,3 +11,7 @@ set(CMAKE_Fortran_DEFINE_FLAG "-WF,-D")
 # -qthreaded     = Ensures that all optimizations will be thread-safe
 # -qhalt=e       = Halt on error messages (rather than just severe errors)
 set(CMAKE_Fortran_FLAGS_INIT "-qthreaded -qhalt=e")
+
+# xlf: 1501-214 (W) command option E reserved for future use - ignored
+set(CMAKE_Fortran_CREATE_PREPROCESSED_SOURCE)
+set(CMAKE_Fortran_CREATE_ASSEMBLY_SOURCE)

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

Summary of changes:
 Modules/Compiler/XL-Fortran.cmake |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake