[Cmake-commits] CMake branch, next, updated. v2.8.2-926-g9745f89
Alexander Neundorf
neundorf at kde.org
Sun Sep 26 05:13:22 EDT 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 9745f89488e1cd20993b5b2aa6611dec1978dbf5 (commit)
via 7b337ac8e20437bf134319bf3131505f69892447 (commit)
via e1fc9b902ac737c98ecaf236568d3e685ea3dce1 (commit)
via f42bae0bd535aa62cd0b6e380251bceb16f75fb0 (commit)
via 7d243b9695f7e04648f6cf3b8dee274ab17862bb (commit)
from b319e4621ecffc82e9784a8e6a2295403059ecef (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=9745f89488e1cd20993b5b2aa6611dec1978dbf5
commit 9745f89488e1cd20993b5b2aa6611dec1978dbf5
Merge: b319e46 7b337ac
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Sep 25 21:03:04 2010 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Sep 25 21:03:04 2010 +0200
Merge branch 'AddASM_NASMSupport' into next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b337ac8e20437bf134319bf3131505f69892447
commit 7b337ac8e20437bf134319bf3131505f69892447
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Sep 25 21:00:52 2010 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Sep 25 21:00:52 2010 +0200
Improve misleading comments.
(the assembler is not really tested)
Alex
diff --git a/Modules/CMakeTestASM-ATTCompiler.cmake b/Modules/CMakeTestASM-ATTCompiler.cmake
index 3b7a74f..581ad0c 100644
--- a/Modules/CMakeTestASM-ATTCompiler.cmake
+++ b/Modules/CMakeTestASM-ATTCompiler.cmake
@@ -13,10 +13,10 @@
# License text for the above reference.)
# This file is used by EnableLanguage in cmGlobalGenerator to
-# determine that that selected ASM-ATT compiler can actually compile
-# and link the most basic of programs. If not, a fatal error
-# is set and cmake stops processing commands and will not generate
-# any makefiles or projects.
+# determine that the selected ASM-ATT "compiler" works.
+# For assembler this can only check whether the compiler has been found,
+# because otherwise there would have to be a separate assembler source file
+# for each assembler on every architecture.
SET(ASM_DIALECT "-ATT")
INCLUDE(CMakeTestASMCompiler)
diff --git a/Modules/CMakeTestASMCompiler.cmake b/Modules/CMakeTestASMCompiler.cmake
index 54def81..56cf332 100644
--- a/Modules/CMakeTestASMCompiler.cmake
+++ b/Modules/CMakeTestASMCompiler.cmake
@@ -13,10 +13,11 @@
# License text for the above reference.)
# This file is used by EnableLanguage in cmGlobalGenerator to
-# determine that that selected ASM compiler can actually compile
-# and link the most basic of programs. If not, a fatal error
-# is set and cmake stops processing commands and will not generate
-# any makefiles or projects.
+# determine that the selected ASM compiler works.
+# For assembler this can only check whether the compiler has been found,
+# because otherwise there would have to be a separate assembler source file
+# for each assembler on every architecture.
+
IF(CMAKE_ASM${ASM_DIALECT}_COMPILER)
SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_WORKS 1 CACHE INTERNAL "")
ELSE(CMAKE_ASM${ASM_DIALECT}_COMPILER)
diff --git a/Modules/CMakeTestASM_MASMCompiler.cmake b/Modules/CMakeTestASM_MASMCompiler.cmake
index 84ca98f..8369b94 100644
--- a/Modules/CMakeTestASM_MASMCompiler.cmake
+++ b/Modules/CMakeTestASM_MASMCompiler.cmake
@@ -13,10 +13,10 @@
# License text for the above reference.)
# This file is used by EnableLanguage in cmGlobalGenerator to
-# determine that the selected ASM_MASM "compiler" (should be masm or masm64)
-# can actually "compile" and link the most basic of programs. If not, a
-# fatal error is set and cmake stops processing commands and will not generate
-# any makefiles or projects.
+# determine that the selected ASM_MASM "compiler" (should be masm or masm64)
+# works. For assembler this can only check whether the compiler has been found,
+# because otherwise there would have to be a separate assembler source file
+# for each assembler on every architecture.
SET(ASM_DIALECT "_MASM")
INCLUDE(CMakeTestASMCompiler)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1fc9b902ac737c98ecaf236568d3e685ea3dce1
commit e1fc9b902ac737c98ecaf236568d3e685ea3dce1
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Sep 25 20:57:03 2010 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Sep 25 20:57:03 2010 +0200
Add support for nasm assembler, patch by Peter Collingbourne (see #10069)
Alex
diff --git a/Modules/CMakeASM_NASMInformation.cmake b/Modules/CMakeASM_NASMInformation.cmake
new file mode 100644
index 0000000..2a73aca
--- /dev/null
+++ b/Modules/CMakeASM_NASMInformation.cmake
@@ -0,0 +1,30 @@
+# support for the nasm assembler
+
+set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm)
+
+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()
+ 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()
+
+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")
+include(CMakeASMInformation)
+set(ASM_DIALECT)
diff --git a/Modules/CMakeDetermineASM_NASMCompiler.cmake b/Modules/CMakeDetermineASM_NASMCompiler.cmake
new file mode 100644
index 0000000..2c8cda5
--- /dev/null
+++ b/Modules/CMakeDetermineASM_NASMCompiler.cmake
@@ -0,0 +1,13 @@
+# Find the nasm assembler
+
+SET(CMAKE_ASM_NASM_COMPILER_INIT nasm)
+
+IF(NOT CMAKE_ASM_NASM_COMPILER)
+ FIND_PROGRAM(CMAKE_ASM_NASM_COMPILER nasm
+ "$ENV{ProgramFiles}/NASM")
+ENDIF(NOT CMAKE_ASM_NASM_COMPILER)
+
+# Load the generic DetermineASM compiler file with the DIALECT set properly:
+SET(ASM_DIALECT "_NASM")
+INCLUDE(CMakeDetermineASMCompiler)
+SET(ASM_DIALECT)
diff --git a/Modules/CMakeTestASM_NASMCompiler.cmake b/Modules/CMakeTestASM_NASMCompiler.cmake
new file mode 100644
index 0000000..ba0e658
--- /dev/null
+++ b/Modules/CMakeTestASM_NASMCompiler.cmake
@@ -0,0 +1,9 @@
+# This file is used by EnableLanguage in cmGlobalGenerator to
+# determine that the selected ASM_NASM "compiler" works.
+# For assembler this can only check whether the compiler has been found,
+# because otherwise there would have to be a separate assembler source file
+# for each assembler on every architecture.
+
+SET(ASM_DIALECT "_NASM")
+INCLUDE(CMakeTestASMCompiler)
+SET(ASM_DIALECT)
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeASM_NASMInformation.cmake | 30 ++++++++++++++++++++++++++
Modules/CMakeDetermineASM_NASMCompiler.cmake | 13 +++++++++++
Modules/CMakeTestASM-ATTCompiler.cmake | 8 +++---
Modules/CMakeTestASMCompiler.cmake | 9 ++++---
Modules/CMakeTestASM_MASMCompiler.cmake | 8 +++---
Modules/CMakeTestASM_NASMCompiler.cmake | 9 +++++++
Source/kwsys/kwsysDateStamp.cmake | 2 +-
7 files changed, 66 insertions(+), 13 deletions(-)
create mode 100644 Modules/CMakeASM_NASMInformation.cmake
create mode 100644 Modules/CMakeDetermineASM_NASMCompiler.cmake
create mode 100644 Modules/CMakeTestASM_NASMCompiler.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list