Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CMake
CMake
Commits
e0b60166
Commit
e0b60166
authored
Nov 12, 2010
by
Alexander Neundorf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some more fixes for nasm support, from Etienne (
#10069
)
Alex
parent
d25c2eb0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
17 deletions
+19
-17
Modules/CMakeASM_NASMInformation.cmake
Modules/CMakeASM_NASMInformation.cmake
+19
-17
No files found.
Modules/CMakeASM_NASMInformation.cmake
View file @
e0b60166
...
@@ -16,27 +16,29 @@
...
@@ -16,27 +16,29 @@
set
(
CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm asm
)
set
(
CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm asm
)
if
(
WIN32
)
if
(
NOT CMAKE_ASM_NASM_OBJECT_FORMAT
)
if
(
CMAKE_C_SIZEOF_DATA_PTR EQUAL 8
)
if
(
WIN32
)
SET
(
CMAKE_ASM_NASM_OBJECT_FORMAT win64
)
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
()
else
()
SET
(
CMAKE_ASM_NASM_OBJECT_FORMAT win32
)
if
(
CMAKE_C_SIZEOF_DATA_PTR EQUAL 8
)
endif
()
SET
(
CMAKE_ASM_NASM_OBJECT_FORMAT elf64
)
elseif
(
APPLE
)
else
()
if
(
CMAKE_C_SIZEOF_DATA_PTR EQUAL 8
)
SET
(
CMAKE_ASM_NASM_OBJECT_FORMAT elf
)
SET
(
CMAKE_ASM_NASM_OBJECT_FORMAT macho64
)
endif
()
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
)
endif
()
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:
# Load the generic ASMInformation file:
set
(
ASM_DIALECT
"_NASM"
)
set
(
ASM_DIALECT
"_NASM"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment