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
Daniel Pfeifer
CMake
Commits
717e1f30
Commit
717e1f30
authored
8 years ago
by
Gregor Jasny
Browse files
Options
Downloads
Patches
Plain Diff
Use looked up uname path for command execution
parent
0bbd993f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Modules/CMakeDetermineSystem.cmake
+4
-4
4 additions, 4 deletions
Modules/CMakeDetermineSystem.cmake
with
4 additions
and
4 deletions
Modules/CMakeDetermineSystem.cmake
+
4
−
4
View file @
717e1f30
...
...
@@ -35,9 +35,9 @@
if
(
CMAKE_HOST_UNIX
)
find_program
(
CMAKE_UNAME uname /bin /usr/bin /usr/local/bin
)
if
(
CMAKE_UNAME
)
exec_program
(
uname
ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION
)
exec_program
(
${
CMAKE_UNAME
}
ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION
)
if
(
CMAKE_HOST_SYSTEM_NAME MATCHES
"Linux|CYGWIN.*|Darwin|^GNU$"
)
exec_program
(
uname
ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
exec_program
(
${
CMAKE_UNAME
}
ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RETURN_VALUE val
)
if
(
CMAKE_HOST_SYSTEM_NAME STREQUAL
"Darwin"
AND
CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL
"Power Macintosh"
)
...
...
@@ -48,10 +48,10 @@ if(CMAKE_HOST_UNIX)
exec_program
(
arch ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RETURN_VALUE val
)
else
()
exec_program
(
uname
ARGS -p OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
exec_program
(
${
CMAKE_UNAME
}
ARGS -p OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RETURN_VALUE val
)
if
(
"
${
val
}
"
GREATER 0
)
exec_program
(
uname
ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
exec_program
(
${
CMAKE_UNAME
}
ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RETURN_VALUE val
)
endif
()
endif
()
...
...
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