ASM_NASM: Honor ASM_NASM env var over standard NASM installation on Windows

Drop the custom `find_program` call in favor of the common
infrastructure.

Fixes: #26873
This commit is contained in:
Brad King
2025-04-15 11:50:35 -04:00
parent 8b4971ec25
commit f1b1b84b22

View File

@@ -11,20 +11,14 @@ if(NOT CMAKE_ASM_NASM_COMPILER)
set(_CMAKE_ASM_NASM_COMPILER_PATHS
"[HKEY_CURRENT_USER\\SOFTWARE\\nasm]"
"$ENV{ProgramFiles}/NASM"
"$ENV{${ENV_VARX86}}/NASM"
"$ENV{${_CMAKE_ENV_VARX86}}/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_ASM_NASM_COMPILER_PATHS)
endif()
# Load the generic DetermineASM compiler file with the DIALECT set properly:
set(ASM_DIALECT "_NASM")
include(CMakeDetermineASMCompiler)
set(ASM_DIALECT)
unset(_CMAKE_ASM_NASM_COMPILER_PATHS)