[Cmake-commits] CMake branch, next, updated. v2.8.3-643-g5cf0a71
Alexander Neundorf
neundorf at kde.org
Wed Nov 17 16:04:37 EST 2010
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 5cf0a714045dbaa54199b16cf21d50efa2d496f2 (commit)
via e0b60166d4c8526db0cf2e8b1eae49ba8ed45ff6 (commit)
via d25c2eb0c0a942d60826e6263d96a2ba59b97b92 (commit)
via e614e9b3d7387b5aa1611f5547744e84b3a0645f (commit)
from 5ec10314db7a352bf2dfab24e75f0f6245466628 (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=5cf0a714045dbaa54199b16cf21d50efa2d496f2
commit 5cf0a714045dbaa54199b16cf21d50efa2d496f2
Merge: 5ec1031 e0b6016
Author: Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Nov 17 16:04:35 2010 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 17 16:04:35 2010 -0500
Merge topic 'AddASM_NASMSupport' into next
e0b6016 Some more fixes for nasm support, from Etienne (#10069)
d25c2eb Use CMAKE_ASM_NASM_FLAGS for nasm instead of FLAGS
e614e9b Add support for yasm, a nasm compatible assembler
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0b60166d4c8526db0cf2e8b1eae49ba8ed45ff6
commit e0b60166d4c8526db0cf2e8b1eae49ba8ed45ff6
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Fri Nov 12 20:27:18 2010 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Fri Nov 12 20:27:18 2010 +0100
Some more fixes for nasm support, from Etienne (#10069)
Alex
diff --git a/Modules/CMakeASM_NASMInformation.cmake b/Modules/CMakeASM_NASMInformation.cmake
index 449d1d6..9da7d30 100644
--- a/Modules/CMakeASM_NASMInformation.cmake
+++ b/Modules/CMakeASM_NASMInformation.cmake
@@ -16,27 +16,29 @@
set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm asm)
-if(WIN32)
- if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
- SET(CMAKE_ASM_NASM_OBJECT_FORMAT win64)
+if(NOT CMAKE_ASM_NASM_OBJECT_FORMAT)
+ if(WIN32)
+ if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
+ SET(CMAKE_ASM_NASM_OBJECT_FORMAT win64)
+ else()
+ SET(CMAKE_ASM_NASM_OBJECT_FORMAT win32)
+ endif()
+ elseif(APPLE)
+ if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
+ SET(CMAKE_ASM_NASM_OBJECT_FORMAT macho64)
+ else()
+ SET(CMAKE_ASM_NASM_OBJECT_FORMAT macho)
+ endif()
else()
- SET(CMAKE_ASM_NASM_OBJECT_FORMAT win32)
- endif()
-elseif(APPLE)
- if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
- SET(CMAKE_ASM_NASM_OBJECT_FORMAT macho64)
- else()
- SET(CMAKE_ASM_NASM_OBJECT_FORMAT macho)
- endif()
-else()
- if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
- SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf64)
- else()
- SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf)
+ if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
+ SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf64)
+ else()
+ SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf)
+ endif()
endif()
endif()
-set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <CMAKE_ASM_NASM_FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
+set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
# Load the generic ASMInformation file:
set(ASM_DIALECT "_NASM")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d25c2eb0c0a942d60826e6263d96a2ba59b97b92
commit d25c2eb0c0a942d60826e6263d96a2ba59b97b92
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Oct 21 20:57:14 2010 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Oct 21 20:57:14 2010 +0200
Use CMAKE_ASM_NASM_FLAGS for nasm instead of FLAGS
Alex
diff --git a/Modules/CMakeASM_NASMInformation.cmake b/Modules/CMakeASM_NASMInformation.cmake
index afe53b3..449d1d6 100644
--- a/Modules/CMakeASM_NASMInformation.cmake
+++ b/Modules/CMakeASM_NASMInformation.cmake
@@ -36,7 +36,7 @@ else()
endif()
endif()
-set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
+set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <CMAKE_ASM_NASM_FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
# Load the generic ASMInformation file:
set(ASM_DIALECT "_NASM")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e614e9b3d7387b5aa1611f5547744e84b3a0645f
commit e614e9b3d7387b5aa1611f5547744e84b3a0645f
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Oct 21 20:51:46 2010 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Oct 21 20:51:46 2010 +0200
Add support for yasm, a nasm compatible assembler
Alex
diff --git a/Modules/CMakeASM_NASMInformation.cmake b/Modules/CMakeASM_NASMInformation.cmake
index 4b533a7..afe53b3 100644
--- a/Modules/CMakeASM_NASMInformation.cmake
+++ b/Modules/CMakeASM_NASMInformation.cmake
@@ -14,7 +14,7 @@
# support for the nasm assembler
-set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm)
+set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm asm)
if(WIN32)
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
diff --git a/Modules/CMakeDetermineASM_NASMCompiler.cmake b/Modules/CMakeDetermineASM_NASMCompiler.cmake
index 18aa813..d184c0a 100644
--- a/Modules/CMakeDetermineASM_NASMCompiler.cmake
+++ b/Modules/CMakeDetermineASM_NASMCompiler.cmake
@@ -12,9 +12,9 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
-# Find the nasm assembler
+# Find the nasm assembler. yasm (http://www.tortall.net/projects/yasm/) is nasm compatible
-SET(CMAKE_ASM_NASM_COMPILER_INIT nasm)
+SET(CMAKE_ASM_NASM_COMPILER_INIT nasm yasm)
IF(NOT CMAKE_ASM_NASM_COMPILER)
FIND_PROGRAM(CMAKE_ASM_NASM_COMPILER nasm
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeASM_NASMInformation.cmake | 36 +++++++++++++------------
Modules/CMakeDetermineASM_NASMCompiler.cmake | 4 +-
2 files changed, 21 insertions(+), 19 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list