[Cmake-commits] CMake branch, next, updated. v2.8.6-2269-gc6f29bb

[Bill Hoffman]

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  c6f29bbed622262bde647813f68fc55df24f1f51 (commit)
       via  50d0abd1dc3d7a220b47d50c4520e200e4d6dab6 (commit)
      from  b248927241b1e7a2bf17b27ff64ff4341876ee5f (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=c6f29bbed622262bde647813f68fc55df24f1f51
commit c6f29bbed622262bde647813f68fc55df24f1f51
Merge: b248927 50d0abd
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Dec 16 17:02:52 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 16 17:02:52 2011 -0500

    Merge topic 'cmake_add_fortran_subdirectory' into next
    
    50d0abd Add a special case for the fortran runtime with the SunPro compiler.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50d0abd1dc3d7a220b47d50c4520e200e4d6dab6
commit 50d0abd1dc3d7a220b47d50c4520e200e4d6dab6
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Dec 16 17:01:19 2011 -0500
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Fri Dec 16 17:01:19 2011 -0500

    Add a special case for the fortran runtime with the SunPro compiler.
    
    The SunPro compiler does not add the fortran runtime library
    when creating a shared fortran library. This causes the test to fail.
    So, if we have the SunPro fortran compiler add -lfsu to the link
    line for libhello.

diff --git a/Tests/VSGNUFortran/fortran/CMakeLists.txt b/Tests/VSGNUFortran/fortran/CMakeLists.txt
index ff22993..d0bb70f 100644
--- a/Tests/VSGNUFortran/fortran/CMakeLists.txt
+++ b/Tests/VSGNUFortran/fortran/CMakeLists.txt
@@ -10,3 +10,6 @@ FortranCInterface_HEADER(HelloWorldFCMangle.h
 add_library(hello SHARED hello.f)
 add_library(world SHARED world.f)
 target_link_libraries(hello world)
+if(CMAKE_Fortran_COMPILER_ID MATCHES SunPro)
+  target_link_libraries(hello fsu)
+endif()

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

Summary of changes:
 Tests/VSGNUFortran/fortran/CMakeLists.txt |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake