[Cmake-commits] CMake branch, master, updated. v3.14.1-570-g81985b7

[Kitware Robot]

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, master has been updated
       via  81985b7c6c9a15ca7a59c54979d8371c783fb581 (commit)
       via  9e4de543d067586b0f74666f7b07717a3f3173e0 (commit)
      from  56ae290284a7f6f7298bf7410a361aaecb7ebbe9 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81985b7c6c9a15ca7a59c54979d8371c783fb581
commit 81985b7c6c9a15ca7a59c54979d8371c783fb581
Merge: 56ae290 9e4de54
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 2 18:17:38 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 2 14:17:57 2019 -0400

    Merge topic 'nasm-fix'
    
    9e4de543d0 Modules: Check nasm compile object variable
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3167


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e4de543d067586b0f74666f7b07717a3f3173e0
commit 9e4de543d067586b0f74666f7b07717a3f3173e0
Author:     Connor Davis <davisc at ainfosec.com>
AuthorDate: Fri Mar 29 21:57:28 2019 -0600
Commit:     Connor Davis <davisc at ainfosec.com>
CommitDate: Fri Mar 29 21:57:28 2019 -0600

    Modules: Check nasm compile object variable
    
    Check if the CMAKE_ASM_NASM_COMPILE_OBJECT variable is set
    before modifying it. Only modify if not previously set.

diff --git a/Modules/CMakeASM_NASMInformation.cmake b/Modules/CMakeASM_NASMInformation.cmake
index 1e3c608..cb793e7 100644
--- a/Modules/CMakeASM_NASMInformation.cmake
+++ b/Modules/CMakeASM_NASMInformation.cmake
@@ -28,7 +28,9 @@ if(NOT CMAKE_ASM_NASM_OBJECT_FORMAT)
   endif()
 endif()
 
-set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
+if(NOT CMAKE_ASM_NASM_COMPILE_OBJECT)
+  set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
+endif()
 
 # Load the generic ASMInformation file:
 set(ASM_DIALECT "_NASM")

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

Summary of changes:
 Modules/CMakeASM_NASMInformation.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake