Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jan Deinhard
CMake
Commits
3328e0a3
Commit
3328e0a3
authored
5 years ago
by
Christian Feldmann
Committed by
Brad King
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
NASM: Fix object format when CXX is enabled but not C
Check CXX data pointer size if C is not set.
parent
348a2a97
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Modules/CMakeASM_NASMInformation.cmake
+9
-3
9 additions, 3 deletions
Modules/CMakeASM_NASMInformation.cmake
with
9 additions
and
3 deletions
Modules/CMakeASM_NASMInformation.cmake
+
9
−
3
View file @
3328e0a3
...
...
@@ -8,19 +8,25 @@ set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm asm)
if
(
NOT CMAKE_ASM_NASM_OBJECT_FORMAT
)
if
(
WIN32
)
if
(
CMAKE_C_SIZEOF_DATA_PTR EQUAL 8
)
if
(
DEFINED CMAKE_C_SIZEOF_DATA_PTR AND CMAKE_C_SIZEOF_DATA_PTR EQUAL 8
)
set
(
CMAKE_ASM_NASM_OBJECT_FORMAT win64
)
elseif
(
DEFINED CMAKE_CXX_SIZEOF_DATA_PTR AND CMAKE_CXX_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
)
if
(
DEFINED CMAKE_C_SIZEOF_DATA_PTR AND CMAKE_C_SIZEOF_DATA_PTR EQUAL 8
)
set
(
CMAKE_ASM_NASM_OBJECT_FORMAT macho64
)
elseif
(
DEFINED CMAKE_CXX_SIZEOF_DATA_PTR AND CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8
)
set
(
CMAKE_ASM_NASM_OBJECT_FORMAT macho64
)
else
()
set
(
CMAKE_ASM_NASM_OBJECT_FORMAT macho
)
endif
()
else
()
if
(
CMAKE_C_SIZEOF_DATA_PTR EQUAL 8
)
if
(
DEFINED CMAKE_C_SIZEOF_DATA_PTR AND CMAKE_C_SIZEOF_DATA_PTR EQUAL 8
)
set
(
CMAKE_ASM_NASM_OBJECT_FORMAT elf64
)
elseif
(
DEFINED CMAKE_CXX_SIZEOF_DATA_PTR AND CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8
)
set
(
CMAKE_ASM_NASM_OBJECT_FORMAT elf64
)
else
()
set
(
CMAKE_ASM_NASM_OBJECT_FORMAT elf
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment