Skip to content

[CMake] Fix relocatable install patch command with Xcode generator #6444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fredroy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[CMake] Fix relocatable install patch command with Xcode generator #6444

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions Sofa/framework/Config/cmake/SofaMacrosInstall.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,16 +838,22 @@ function(sofa_set_project_install_relocatable project_name binary_dir install_di
&& ${CMAKE_COMMAND} -E copy \"${binary_dir}/cmake_install.cmakepatch\" \"${binary_dir}/cmake_install.cmake\"
)
else()
# Makefile/Ninja unescape "$$" to "$" before running the shell, Xcode does not:
# a leftover "$$" makes the shell expand the variable itself
set(escaped_dollar "\$\$")
if(CMAKE_GENERATOR MATCHES "Xcode")
set(escaped_dollar "\$")
endif()
add_custom_target(${custom_target} ALL
COMMENT "${project_name}: Patching cmake_install.cmake"
COMMAND
test ! -e ${binary_dir}/cmake_install.cmakepatch
&& echo \" set ( CMAKE_INSTALL_PREFIX_BACK_${project_name}_${binary_dirname} \\"\\$$\{CMAKE_INSTALL_PREFIX\}\\" ) \"
&& echo \" set ( CMAKE_INSTALL_PREFIX_BACK_${project_name}_${binary_dirname} \\"\\${escaped_dollar}\{CMAKE_INSTALL_PREFIX\}\\" ) \"
> "${binary_dir}/cmake_install.cmakepatch"
&& echo \" set ( CMAKE_INSTALL_PREFIX \\"\\$$\{CMAKE_INSTALL_PREFIX\}/${install_dir}/${project_name}\\" ) \"
&& echo \" set ( CMAKE_INSTALL_PREFIX \\"\\${escaped_dollar}\{CMAKE_INSTALL_PREFIX\}/${install_dir}/${project_name}\\" ) \"
>> "${binary_dir}/cmake_install.cmakepatch"
&& cat ${binary_dir}/cmake_install.cmake >> ${binary_dir}/cmake_install.cmakepatch
&& echo \" set ( CMAKE_INSTALL_PREFIX \\"\\$$\{CMAKE_INSTALL_PREFIX_BACK_${project_name}_${binary_dirname}\}\\" ) \"
&& echo \" set ( CMAKE_INSTALL_PREFIX \\"\\${escaped_dollar}\{CMAKE_INSTALL_PREFIX_BACK_${project_name}_${binary_dirname}\}\\" ) \"
>> "${binary_dir}/cmake_install.cmakepatch"
&& ${CMAKE_COMMAND} -E copy ${binary_dir}/cmake_install.cmakepatch ${binary_dir}/cmake_install.cmake
|| true
Expand Down
Loading