[Cmake-commits] CMake branch, next, updated. v2.8.9-443-g8c7679d

[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  8c7679d7c542aa7cfc0384fe9e124a2677fcd329 (commit)
       via  b5e10132aeb4545de4370fee9cdad14833688be1 (commit)
      from  3358eb330ccb500cb456ce1b68c294c4980964c3 (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=8c7679d7c542aa7cfc0384fe9e124a2677fcd329
commit 8c7679d7c542aa7cfc0384fe9e124a2677fcd329
Merge: 3358eb3 b5e1013
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 11 11:20:43 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 11 11:20:43 2012 -0400

    Merge topic 'FortranCrossCompiling3' into next
    
    b5e1013 CMakeDetermineFortranCompiler: Compute toolchain dir after compiler


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5e10132aeb4545de4370fee9cdad14833688be1
commit b5e10132aeb4545de4370fee9cdad14833688be1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 11 11:16:31 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 11 11:17:31 2012 -0400

    CMakeDetermineFortranCompiler: Compute toolchain dir after compiler
    
    Since commit b8b5c834 (Re-order C/C++/Fortran compiler determination
    logic, 2012-08-15) we compute _CMAKE_TOOLCHAIN_LOCATION after running
    the compiler id detection step.

diff --git a/Modules/CMakeDetermineFortranCompiler.cmake b/Modules/CMakeDetermineFortranCompiler.cmake
index 1828988..f861e39 100644
--- a/Modules/CMakeDetermineFortranCompiler.cmake
+++ b/Modules/CMakeDetermineFortranCompiler.cmake
@@ -134,10 +134,6 @@ else()
     )
 endif()
 
-if (NOT _CMAKE_TOOLCHAIN_LOCATION)
-  get_filename_component(_CMAKE_TOOLCHAIN_LOCATION "${CMAKE_Fortran_COMPILER}" PATH)
-endif ()
-
 # Build a small source file to identify the compiler.
 if(NOT CMAKE_Fortran_COMPILER_ID_RUN)
   set(CMAKE_Fortran_COMPILER_ID_RUN 1)
@@ -193,6 +189,10 @@ if(NOT CMAKE_Fortran_COMPILER_ID_RUN)
   endif()
 endif()
 
+if (NOT _CMAKE_TOOLCHAIN_LOCATION)
+  get_filename_component(_CMAKE_TOOLCHAIN_LOCATION "${CMAKE_Fortran_COMPILER}" PATH)
+endif ()
+
 # if we have a fortran cross compiler, they have usually some prefix, like
 # e.g. powerpc-linux-gfortran, arm-elf-gfortran or i586-mingw32msvc-gfortran , optionally
 # with a 3-component version number at the end (e.g. arm-eabi-gcc-4.5.2).

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

Summary of changes:
 Modules/CMakeDetermineFortranCompiler.cmake |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake