[Cmake-commits] CMake branch, next, updated. v2.8.5-1675-gc868ef8

[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  c868ef8d18322adf14ee1cd6d004b3a263c55861 (commit)
       via  cd70f00ea473a97b3b210fb9fddbc283299d788a (commit)
      from  ff1236fa10ccb09cf607d8f42cccbc0a213f042e (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=c868ef8d18322adf14ee1cd6d004b3a263c55861
commit c868ef8d18322adf14ee1cd6d004b3a263c55861
Merge: ff1236f cd70f00
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Mon Aug 22 17:38:23 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 22 17:38:23 2011 -0400

    Merge topic 'FixOptionalEnableAsm' into next
    
    cd70f00 Fix #12358: make optionally enabling ASM work again


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd70f00ea473a97b3b210fb9fddbc283299d788a
commit cd70f00ea473a97b3b210fb9fddbc283299d788a
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Aug 17 01:00:28 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Aug 17 01:00:28 2011 +0200

    Fix #12358: make optionally enabling ASM work again
    
    Alex

diff --git a/Modules/CMakeASMInformation.cmake b/Modules/CMakeASMInformation.cmake
index d50f351..b5f2420 100644
--- a/Modules/CMakeASMInformation.cmake
+++ b/Modules/CMakeASMInformation.cmake
@@ -33,7 +33,7 @@ IF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
 ENDIF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
 IF(NOT _INCLUDED_FILE)
   IF("ASM${ASM_DIALECT}" STREQUAL "ASM")
-    MESSAGE(FATAL_ERROR "Did not find file Compiler/${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}-ASM${ASM_DIALECT}")
+    MESSAGE(STATUS "Warning: Did not find file Compiler/${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}-ASM${ASM_DIALECT}")
   ENDIF("ASM${ASM_DIALECT}" STREQUAL "ASM")
   INCLUDE(Platform/${CMAKE_BASE_NAME} OPTIONAL)
 ENDIF(NOT _INCLUDED_FILE)
diff --git a/Modules/CMakeTestASMCompiler.cmake b/Modules/CMakeTestASMCompiler.cmake
index 56cf332..294511d 100644
--- a/Modules/CMakeTestASMCompiler.cmake
+++ b/Modules/CMakeTestASMCompiler.cmake
@@ -18,8 +18,18 @@
 # because otherwise there would have to be a separate assembler source file
 # for each assembler on every architecture.
 
+
+SET(_ASM_COMPILER_WORKS 0)
+
 IF(CMAKE_ASM${ASM_DIALECT}_COMPILER)
-  SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_WORKS 1 CACHE INTERNAL "")
-ELSE(CMAKE_ASM${ASM_DIALECT}_COMPILER)
-  SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_WORKS 0 CACHE INTERNAL "")
-ENDIF(CMAKE_ASM${ASM_DIALECT}_COMPILER)
+  SET(_ASM_COMPILER_WORKS 1)
+ENDIF()
+
+# when using generic "ASM" support, we must have detected the compiler ID, fail otherwise:
+IF("ASM${ASM_DIALECT}" STREQUAL "ASM")
+  IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
+    SET(_ASM_COMPILER_WORKS 0)
+  ENDIF()
+ENDIF()
+
+SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_WORKS ${_ASM_COMPILER_WORKS} CACHE INTERNAL "")

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

Summary of changes:
 Modules/CMakeASMInformation.cmake  |    2 +-
 Modules/CMakeTestASMCompiler.cmake |   18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake