Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cellframe-sdk
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
17
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
cellframe
cellframe-sdk
Commits
ecfa0e06
Commit
ecfa0e06
authored
1 year ago
by
Dmitry Puzyrkov
Browse files
Options
Downloads
Patches
Plain Diff
[+] allow to set MACOS_ARCH outside the build
parent
07403ada
No related branches found
No related tags found
1 merge request
!1277
[+] allow to set MACOS_ARCH outside the build
Pipeline
#29875
passed with stage
in 9 minutes and 53 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/OS_Detection.cmake
+9
-6
9 additions, 6 deletions
cmake/OS_Detection.cmake
dap-sdk
+1
-1
1 addition, 1 deletion
dap-sdk
with
10 additions
and
7 deletions
cmake/OS_Detection.cmake
+
9
−
6
View file @
ecfa0e06
...
...
@@ -67,12 +67,15 @@ if(UNIX)
if
(
${
_CMAKE_OSX_SYSROOT_PATH
}
MATCHES
"MacOS"
)
set
(
MACOS ON
)
# on macOS "uname -m" returns the architecture (x86_64 or arm64)
execute_process
(
COMMAND uname -m
RESULT_VARIABLE result
OUTPUT_VARIABLE MACOS_ARCH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if
(
NOT DEFINED MACOS_ARCH
)
execute_process
(
COMMAND uname -m
RESULT_VARIABLE result
OUTPUT_VARIABLE MACOS_ARCH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif
()
add_definitions
(
"-DDAP_OS_MAC -DDAP_OS_MAC_ARCH=
${
MACOS_ARCH
}
"
)
elseif
(
${
_CMAKE_OSX_SYSROOT_PATH
}
MATCHES
"iOS"
)
set
(
IOS ON
)
...
...
This diff is collapsed.
Click to expand it.
dap-sdk
@
dd493a20
Compare
933f9747
...
dd493a20
Subproject commit
933f97479602d7b4be2c8fdbe6f6d2aea7dfc9b9
Subproject commit
dd493a209579b92a9935d59c546ce276d0e653c4
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