[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-750-ge4db3f8

Nils Gladitz nilsgladitz at gmail.com
Thu Nov 20 08:55:23 EST 2014


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  e4db3f81ebd5cb54241849b602395106f674864b (commit)
       via  7d633ebfa016e942261c94c10ca86ef46132ab5e (commit)
      from  bb7a0ad79b00307da073c5c34a92173a92558f2f (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=e4db3f81ebd5cb54241849b602395106f674864b
commit e4db3f81ebd5cb54241849b602395106f674864b
Merge: bb7a0ad 7d633eb
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Nov 20 08:55:22 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 20 08:55:22 2014 -0500

    Merge topic 'fix-openmp-fortran' into next
    
    7d633ebf FindOpenMP: Use fixed form Fortran test program


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d633ebfa016e942261c94c10ca86ef46132ab5e
commit 7d633ebfa016e942261c94c10ca86ef46132ab5e
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Nov 20 14:54:11 2014 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Thu Nov 20 14:54:11 2014 +0100

    FindOpenMP: Use fixed form Fortran test program
    
    This prevents the test program from failing when build as Fortran 77.
    
    Suggested-by: Alin Marin Elena <alinm.elena at gmail.com>

diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake
index 801b4f8..a102c66 100644
--- a/Modules/FindOpenMP.cmake
+++ b/Modules/FindOpenMP.cmake
@@ -111,11 +111,11 @@ int main() {
 # same in Fortran
 set(OpenMP_Fortran_TEST_SOURCE
   "
-program test
-use omp_lib
-integer :: n
-n = omp_get_num_threads()
-end program test
+      program test
+      use omp_lib
+      integer :: n
+      n = omp_get_num_threads()
+      end program test
   "
   )
 

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

Summary of changes:
 Modules/FindOpenMP.cmake |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list