From 9e4de543d067586b0f74666f7b07717a3f3173e0 Mon Sep 17 00:00:00 2001 From: Connor Davis Date: Fri, 29 Mar 2019 21:57:28 -0600 Subject: 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. --- Modules/CMakeASM_NASMInformation.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 " -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o ") +if(NOT CMAKE_ASM_NASM_COMPILE_OBJECT) + set(CMAKE_ASM_NASM_COMPILE_OBJECT " -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o ") +endif() # Load the generic ASMInformation file: set(ASM_DIALECT "_NASM") -- cgit v0.12