Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-05-09 14:57:08 +08:00
Code Issues Projects Releases Wiki Activity

Merge topic 'nasm-find-compiler'

Browse Source 
f1b1b84b22 ASM_NASM: Honor ASM_NASM env var over standard NASM installation on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10662
This commit is contained in:
Brad King 2025-04-16 13:52:33 +00:00 committed by Kitware Robot
commit ca9fa874d8
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/CMakeDetermineASM_NASMCompiler.cmake
View File

@ -11,20 +11,14 @@ if(NOT CMAKE_ASM_NASM_COMPILER)
set(_CMAKE_ASM_NASM_COMPILER_PATHS set(_CMAKE_ASM_NASM_COMPILER_PATHS
"[HKEY_CURRENT_USER\\SOFTWARE\\nasm]" "[HKEY_CURRENT_USER\\SOFTWARE\\nasm]"
"$ENV{ProgramFiles}/NASM" "$ENV{ProgramFiles}/NASM"
"$ENV{${ENV_VARX86}}/NASM" "$ENV{${_CMAKE_ENV_VARX86}}/NASM"
"$ENV{LOCALAPPDATA}/NASM" "$ENV{LOCALAPPDATA}/NASM"
) )
find_program(CMAKE_ASM_NASM_COMPILER
NAMES ${CMAKE_ASM_NASM_COMPILER_LIST}
PATHS ${_CMAKE_ASM_NASM_COMPILER_PATHS}
NO_DEFAULT_PATH
DOC "NASM compiler"
)
unset(_CMAKE_ENV_VARX86) unset(_CMAKE_ENV_VARX86)
unset(_CMAKE_ASM_NASM_COMPILER_PATHS)
endif() endif()
# Load the generic DetermineASM compiler file with the DIALECT set properly: # Load the generic DetermineASM compiler file with the DIALECT set properly:
set(ASM_DIALECT "_NASM") set(ASM_DIALECT "_NASM")
include(CMakeDetermineASMCompiler) include(CMakeDetermineASMCompiler)
set(ASM_DIALECT) set(ASM_DIALECT)
unset(_CMAKE_ASM_NASM_COMPILER_PATHS)