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
28c1be7a
Commit
28c1be7a
authored
Nov 23, 2010
by
Clinton Stimpson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BundleUtilities: only do rpath strip on copied prerequisites.
parent
a0739ac5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
Modules/BundleUtilities.cmake
Modules/BundleUtilities.cmake
+6
-6
No files found.
Modules/BundleUtilities.cmake
View file @
28c1be7a
...
...
@@ -472,11 +472,11 @@ function(copy_resolved_item_into_bundle resolved_item resolved_embedded_item)
else
()
#message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-E copy
"
${
resolved_item
}
"
"
${
resolved_embedded_item
}
"
)
if
(
UNIX AND NOT APPLE
)
file
(
RPATH_REMOVE FILE
"
${
resolved_embedded_item
}
"
)
endif
(
UNIX AND NOT APPLE
)
endif
()
if
(
UNIX AND NOT APPLE
)
file
(
RPATH_REMOVE FILE
"
${
resolved_embedded_item
}
"
)
endif
(
UNIX AND NOT APPLE
)
endfunction
(
copy_resolved_item_into_bundle
)
...
...
@@ -514,11 +514,11 @@ function(copy_resolved_framework_into_bundle resolved_item resolved_embedded_ite
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-E copy_directory
"
${
resolved_resources
}
"
"
${
resolved_embedded_resources
}
"
)
endif
()
endif
()
if
(
UNIX AND NOT APPLE
)
file
(
RPATH_REMOVE FILE
"
${
resolved_embedded_item
}
"
)
endif
(
UNIX AND NOT APPLE
)
endif
()
if
(
UNIX AND NOT APPLE
)
file
(
RPATH_REMOVE FILE
"
${
resolved_embedded_item
}
"
)
endif
(
UNIX AND NOT APPLE
)
endfunction
(
copy_resolved_framework_into_bundle
)
...
...
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