-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '09265145041bee53ade04a47f23b1a7c232007fb'
- Loading branch information
Showing
62 changed files
with
39,191 additions
and
38,189 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...make/CMakeDetermineASM_YASMCompiler.cmake → ...make/CMakeDetermineASM_NASMCompiler.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
set(ASM_DIALECT "_YASM") | ||
set(CMAKE_ASM${ASM_DIALECT}_COMPILER ${YASM_EXECUTABLE}) | ||
set(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ${_CMAKE_TOOLCHAIN_PREFIX}yasm) | ||
set(ASM_DIALECT "_NASM") | ||
set(CMAKE_ASM${ASM_DIALECT}_COMPILER ${NASM_EXECUTABLE}) | ||
set(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ${_CMAKE_TOOLCHAIN_PREFIX}nasm) | ||
include(CMakeDetermineASMCompiler) | ||
set(ASM_DIALECT) |
2 changes: 1 addition & 1 deletion
2
source/cmake/CMakeTestASM_YASMCompiler.cmake → source/cmake/CMakeTestASM_NASMCompiler.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
set(ASM_DIALECT "_YASM") | ||
set(ASM_DIALECT "_NASM") | ||
include(CMakeTestASMCompiler) | ||
set(ASM_DIALECT) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
include(FindPackageHandleStandardArgs) | ||
|
||
# Simple path search with YASM_ROOT environment variable override | ||
find_program(NASM_EXECUTABLE | ||
NAMES nasm nasm-2.13.0-win32 nasm-2.13.0-win64 nasm nasm-2.13.0-win32 nasm-2.13.0-win64 | ||
HINTS $ENV{NASM_ROOT} ${NASM_ROOT} | ||
PATH_SUFFIXES bin | ||
) | ||
|
||
if(NASM_EXECUTABLE) | ||
execute_process(COMMAND ${NASM_EXECUTABLE} -version | ||
OUTPUT_VARIABLE nasm_version | ||
ERROR_QUIET | ||
OUTPUT_STRIP_TRAILING_WHITESPACE | ||
) | ||
if(nasm_version MATCHES "^NASM version ([0-9\\.]*)") | ||
set(NASM_VERSION_STRING "${CMAKE_MATCH_1}") | ||
endif() | ||
unset(nasm_version) | ||
endif() | ||
|
||
# Provide standardized success/failure messages | ||
find_package_handle_standard_args(nasm | ||
REQUIRED_VARS NASM_EXECUTABLE | ||
VERSION_VAR NASM_VERSION_STRING) |
Oops, something went wrong.