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
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
André Pedro
CMake
Commits
aff1e77f
Commit
aff1e77f
authored
8 years ago
by
Ruslan Baratov
Committed by
Gregor Jasny
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
CMakeIOSInstallCombined: do not merge content of OUTPUT and ERROR variables
parent
3a044943
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Modules/CMakeIOSInstallCombined.cmake
+5
-2
5 additions, 2 deletions
Modules/CMakeIOSInstallCombined.cmake
with
5 additions
and
2 deletions
Modules/CMakeIOSInstallCombined.cmake
+
5
−
2
View file @
aff1e77f
...
...
@@ -237,17 +237,20 @@ function(ios_install_combined target destination)
endif
()
set
(
cmd xcrun -f lipo
)
# Do not merge OUTPUT_VARIABLE and ERROR_VARIABLE since latter may contain
# some diagnostic information even for the successful run.
execute_process
(
COMMAND
${
cmd
}
RESULT_VARIABLE result
OUTPUT_VARIABLE output
ERROR_VARIABLE output
ERROR_VARIABLE
error_
output
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_STRIP_TRAILING_WHITESPACE
)
if
(
NOT result EQUAL 0
)
message
(
FATAL_ERROR
"Command failed (
${
result
}
):
${
cmd
}
\n\n
Output:
\n
${
output
}
"
FATAL_ERROR
"Command failed (
${
result
}
):
${
cmd
}
\n\n
Output:
\n
${
output
}
\n
Output(error):
\n
${
error_output
}
"
)
endif
()
set
(
_lipo_path
${
output
}
)
...
...
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