[Cmake-commits] CMake branch, next, updated. v2.8.5-1859-g1118ff1

[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  1118ff1c65aebe810e2383eee15a92aa2891bc36 (commit)
       via  71402eb25244e5805df54c2f6e62ddd36201dbd6 (commit)
      from  ec8434567837e8305a2d67734d49f0b70ad7fe3b (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=1118ff1c65aebe810e2383eee15a92aa2891bc36
commit 1118ff1c65aebe810e2383eee15a92aa2891bc36
Merge: ec84345 71402eb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 8 15:04:51 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 8 15:04:51 2011 -0400

    Merge topic 'FortranCInterface-VS' into next
    
    71402eb FortranCInterface: Compile separate Fortran lib in VerifyC[XX]


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71402eb25244e5805df54c2f6e62ddd36201dbd6
commit 71402eb25244e5805df54c2f6e62ddd36201dbd6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 8 14:56:48 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 8 14:56:48 2011 -0400

    FortranCInterface: Compile separate Fortran lib in VerifyC[XX]
    
    The Intel Fortran plugin for Visual Studio requires Fortran source files
    to be compiled in a separate target from C and C++ code.  Compile the
    VerifyFortran.f source file in a separate library and link the main
    VerifyFortanC executable to it.

diff --git a/Modules/FortranCInterface/Verify/CMakeLists.txt b/Modules/FortranCInterface/Verify/CMakeLists.txt
index 052dd59..e969f24 100644
--- a/Modules/FortranCInterface/Verify/CMakeLists.txt
+++ b/Modules/FortranCInterface/Verify/CMakeLists.txt
@@ -24,7 +24,9 @@ include(FortranCInterface)
 FortranCInterface_HEADER(VerifyFortran.h SYMBOLS VerifyFortran)
 include_directories(${VerifyFortranC_BINARY_DIR})
 
-add_executable(VerifyFortranC main.c VerifyC.c VerifyFortran.f ${VerifyCXX})
+add_library(VerifyFortran STATIC VerifyFortran.f)
+add_executable(VerifyFortranC main.c VerifyC.c ${VerifyCXX})
+target_link_libraries(VerifyFortranC VerifyFortran)
 
 if(NOT VERIFY_CXX)
   # The entry point (main) is defined in C; link with the C compiler.

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

Summary of changes:
 Modules/FortranCInterface/Verify/CMakeLists.txt |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake