[Cmake-commits] CMake branch, next, updated. v2.8.3-645-gbd4fba9

[Alexander Neundorf]

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  bd4fba99a589ee1a640f4006b4195c4cd7ba2750 (commit)
       via  e3dfbf62fcd54f582057fcec7a7989ac73712e55 (commit)
      from  5cf0a714045dbaa54199b16cf21d50efa2d496f2 (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=bd4fba99a589ee1a640f4006b4195c4cd7ba2750
commit bd4fba99a589ee1a640f4006b4195c4cd7ba2750
Merge: 5cf0a71 e3dfbf6
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Nov 17 17:05:40 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 17 17:05:40 2010 -0500

    Merge topic 'IncludeCMakeDetermineCompilerIdInDetermineASMCompiler' into next
    
    e3dfbf6 Include CMakeDetermineCompilerId in CMakeDetermineASMCompiler.cmake (#11467)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3dfbf62fcd54f582057fcec7a7989ac73712e55
commit e3dfbf62fcd54f582057fcec7a7989ac73712e55
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Nov 17 23:01:36 2010 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Nov 17 23:01:36 2010 +0100

    Include CMakeDetermineCompilerId in CMakeDetermineASMCompiler.cmake (#11467)
    
    CMakeDetermineASMCompiler.cmake relied on that somebody else (usually
    during enabling C or CXX) already included that file, and broke if that
    was not the case.
    Thanks to Louis for the patch
    
    Alex

diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake
index 06dd6b8..8353be4 100644
--- a/Modules/CMakeDetermineASMCompiler.cmake
+++ b/Modules/CMakeDetermineASMCompiler.cmake
@@ -65,6 +65,7 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
   SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_GNU "--version")
   SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_GNU "GNU assembler")
 
+  INCLUDE(CMakeDetermineCompilerId)
   CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT})
 
   IF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)

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

Summary of changes:
 Modules/CMakeDetermineASMCompiler.cmake |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake