[Cmake-commits] CMake branch, next, updated. v2.8.2-930-g49fcd05

[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  49fcd0554f128b133942035938b1e0dc8b9ca4da (commit)
       via  ffeca06a93eca70ef7505ac087cbb246e5191ed2 (commit)
      from  6ba893ac7f5d55287878a62512e79625d5972509 (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=49fcd0554f128b133942035938b1e0dc8b9ca4da
commit 49fcd0554f128b133942035938b1e0dc8b9ca4da
Merge: 6ba893a ffeca06
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Mon Sep 27 22:05:24 2010 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Mon Sep 27 22:05:24 2010 +0200

    Merge branch 'AddASM_NASMSupport' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffeca06a93eca70ef7505ac087cbb246e5191ed2
commit ffeca06a93eca70ef7505ac087cbb246e5191ed2
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Mon Sep 27 18:04:34 2010 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Mon Sep 27 18:04:34 2010 +0200

    Add missing copyright headers
    
    Alex

diff --git a/Modules/CMakeASM_NASMInformation.cmake b/Modules/CMakeASM_NASMInformation.cmake
index 2a73aca..ca9b8ae 100644
--- a/Modules/CMakeASM_NASMInformation.cmake
+++ b/Modules/CMakeASM_NASMInformation.cmake
@@ -1,3 +1,17 @@
+
+#=============================================================================
+# Copyright 2008-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
 # support for the nasm assembler
 
 set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm)
diff --git a/Modules/CMakeDetermineASM_NASMCompiler.cmake b/Modules/CMakeDetermineASM_NASMCompiler.cmake
index 2c8cda5..41326ee 100644
--- a/Modules/CMakeDetermineASM_NASMCompiler.cmake
+++ b/Modules/CMakeDetermineASM_NASMCompiler.cmake
@@ -1,3 +1,17 @@
+
+#=============================================================================
+# Copyright 2008-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
 # Find the nasm assembler
 
 SET(CMAKE_ASM_NASM_COMPILER_INIT nasm)
diff --git a/Modules/CMakeTestASM_NASMCompiler.cmake b/Modules/CMakeTestASM_NASMCompiler.cmake
index ba0e658..477c43b 100644
--- a/Modules/CMakeTestASM_NASMCompiler.cmake
+++ b/Modules/CMakeTestASM_NASMCompiler.cmake
@@ -1,3 +1,17 @@
+
+#=============================================================================
+# Copyright 2008-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
 # 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,

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

Summary of changes:
 Modules/CMakeASM_NASMInformation.cmake       |   14 ++++++++++++++
 Modules/CMakeDetermineASM_NASMCompiler.cmake |   14 ++++++++++++++
 Modules/CMakeTestASM_NASMCompiler.cmake      |   14 ++++++++++++++
 3 files changed, 42 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake