[Cmake-commits] CMake branch, next, updated. v2.8.4-1051-gde19a39
Alexander Neundorf
neundorf at kde.org
Tue Mar 1 15:44:30 EST 2011
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 de19a390e282c6e853b0ae3e4c8cc02cc98f937b (commit)
via 9071b8b87f0e63f10f1f77949246c1b4241cfb6c (commit)
via 48f7199df083f1b6f18a02b97cfec09ce5efffbd (commit)
via d103c751fa0b89215ed2a4dd143ab2bb980b270f (commit)
via 20fe0beb7e205db76af4db1babe30f9f3bd62992 (commit)
from 7375f6ce8c8fa782374b73bbea12ad90c66bb7c6 (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=de19a390e282c6e853b0ae3e4c8cc02cc98f937b
commit de19a390e282c6e853b0ae3e4c8cc02cc98f937b
Merge: 7375f6c 9071b8b
Author: Alexander Neundorf <neundorf at kde.org>
AuthorDate: Tue Mar 1 15:44:27 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 1 15:44:27 2011 -0500
Merge topic 'ReworkedAsmSupport' into next
9071b8b Add temporary debug output for compiler ID detection for ASM
48f7199 It's ELSEIF(), not ELSIF()
d103c75 Fix bad comparison in the detect assembler-code
20fe0be Only try assembler support for Makefile-based generators
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9071b8b87f0e63f10f1f77949246c1b4241cfb6c
commit 9071b8b87f0e63f10f1f77949246c1b4241cfb6c
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Mar 1 21:41:02 2011 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Mar 1 21:41:02 2011 +0100
Add temporary debug output for compiler ID detection for ASM
Alex
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 9a3884a..b160dee 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -287,6 +287,13 @@ FUNCTION(CMAKE_DETERMINE_COMPILER_ID_VENDOR lang)
RESULT_VARIABLE result
TIMEOUT 10
)
+
+ IF("${lang}" STREQUAL "ASM")
+ MESSAGE(STATUS "Checked for ${vendor}")
+ MESSAGE(STATUS " Output: -${output}-")
+ MESSAGE(STATUS " Result: -${result}-")
+ ENDIF("${lang}" STREQUAL "ASM")
+
IF("${output}" MATCHES "${regex}")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
"Checking whether the ${lang} compiler is ${vendor} using \"${flags}\" "
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48f7199df083f1b6f18a02b97cfec09ce5efffbd
commit 48f7199df083f1b6f18a02b97cfec09ce5efffbd
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Mar 1 21:39:19 2011 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Mar 1 21:39:19 2011 +0100
It's ELSEIF(), not ELSIF()
Alex
diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake
index 875c322..ceab6aa 100644
--- a/Modules/CMakeDetermineASMCompiler.cmake
+++ b/Modules/CMakeDetermineASMCompiler.cmake
@@ -30,7 +30,7 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER)
IF(CMAKE_C_COMPILER)
SET(CMAKE_ASM_COMPILER "${CMAKE_C_COMPILER}" CACHE FILEPATH "The ASM compiler")
SET(CMAKE_ASM_COMPILER_ID "${CMAKE_C_COMPILER_ID}")
- ELSIF(CMAKE_CXX_COMPILER)
+ ELSEIF(CMAKE_CXX_COMPILER)
SET(CMAKE_ASM_COMPILER "${CMAKE_CXX_COMPILER}" CACHE FILEPATH "The ASM compiler")
SET(CMAKE_ASM_COMPILER_ID "${CMAKE_CXX_COMPILER_ID}")
ELSE(CMAKE_CXX_COMPILER)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d103c751fa0b89215ed2a4dd143ab2bb980b270f
commit d103c751fa0b89215ed2a4dd143ab2bb980b270f
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Mar 1 21:28:54 2011 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Mar 1 21:28:54 2011 +0100
Fix bad comparison in the detect assembler-code
(there was a if("${CMAKE_C_COMPILER}") instead of if(CMAKE_C_COMPILER) )
Alex
diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake
index c6e54d7..875c322 100644
--- a/Modules/CMakeDetermineASMCompiler.cmake
+++ b/Modules/CMakeDetermineASMCompiler.cmake
@@ -27,17 +27,17 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER)
SET(CMAKE_ASM_COMPILER_LIST ${CMAKE_ASM_COMPILER_INIT})
ELSE(CMAKE_ASM_COMPILER_INIT)
- IF("${CMAKE_C_COMPILER}")
+ IF(CMAKE_C_COMPILER)
SET(CMAKE_ASM_COMPILER "${CMAKE_C_COMPILER}" CACHE FILEPATH "The ASM compiler")
SET(CMAKE_ASM_COMPILER_ID "${CMAKE_C_COMPILER_ID}")
- ELSIF("${CMAKE_CXX_COMPILER}")
+ ELSIF(CMAKE_CXX_COMPILER)
SET(CMAKE_ASM_COMPILER "${CMAKE_CXX_COMPILER}" CACHE FILEPATH "The ASM compiler")
SET(CMAKE_ASM_COMPILER_ID "${CMAKE_CXX_COMPILER_ID}")
- ELSE("${CMAKE_CXX_COMPILER}")
+ ELSE(CMAKE_CXX_COMPILER)
# List all default C and CXX compilers
SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}gcc ${_CMAKE_TOOLCHAIN_PREFIX}cc cl bcc xlc
${_CMAKE_TOOLCHAIN_PREFIX}c++ ${_CMAKE_TOOLCHAIN_PREFIX}g++ CC aCC cl bcc xlC)
- ENDIF("${CMAKE_C_COMPILER}")
+ ENDIF(CMAKE_C_COMPILER)
ENDIF(CMAKE_ASM_COMPILER_INIT)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20fe0beb7e205db76af4db1babe30f9f3bd62992
commit 20fe0beb7e205db76af4db1babe30f9f3bd62992
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Mar 1 21:19:39 2011 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Mar 1 21:19:39 2011 +0100
Only try assembler support for Makefile-based generators
Alex
diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt
index b23fc79..32727ed 100644
--- a/Tests/Assembler/CMakeLists.txt
+++ b/Tests/Assembler/CMakeLists.txt
@@ -5,10 +5,12 @@ set(SRCS)
# (at least) the following toolchains can process assembler files directly
# and also generate assembler files from C:
-if("${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|HP|Intel|SunPro|XL)$")
- execute_process(COMMAND ${CMAKE_C_COMPILER} -S "${CMAKE_CURRENT_SOURCE_DIR}/main.c" -o "${CMAKE_CURRENT_BINARY_DIR}/main.s")
- set(SRCS "${CMAKE_CURRENT_BINARY_DIR}/main.s")
-endif("${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|HP|Intel|SunPro|XL)$")
+if("${CMAKE_GENERATOR}" MATCHES "Makefile")
+ if("${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|HP|Intel|SunPro|XL)$")
+ execute_process(COMMAND ${CMAKE_C_COMPILER} -S "${CMAKE_CURRENT_SOURCE_DIR}/main.c" -o "${CMAKE_CURRENT_BINARY_DIR}/main.s")
+ set(SRCS "${CMAKE_CURRENT_BINARY_DIR}/main.s")
+ endif("${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|HP|Intel|SunPro|XL)$")
+endif("${CMAKE_GENERATOR}" MATCHES "Makefile")
if(SRCS)
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeDetermineASMCompiler.cmake | 8 ++++----
Modules/CMakeDetermineCompilerId.cmake | 7 +++++++
Tests/Assembler/CMakeLists.txt | 10 ++++++----
3 files changed, 17 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list