From e0b60166d4c8526db0cf2e8b1eae49ba8ed45ff6 Mon Sep 17 00:00:00 2001
From: Alex Neundorf <neundorf@kde.org>
Date: Fri, 12 Nov 2010 20:27:18 +0100
Subject: [PATCH] Some more fixes for nasm support, from Etienne (#10069)

Alex
---
 Modules/CMakeASM_NASMInformation.cmake | 36 ++++++++++++++------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/Modules/CMakeASM_NASMInformation.cmake b/Modules/CMakeASM_NASMInformation.cmake
index 449d1d6a65..9da7d306c2 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")