mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 06:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'imported-framework-soname-file'

Browse Source 
820d3afb28 Framework: Fix $<TARGET_SONAME_FILE:...> for imported frameworks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !6147
This commit is contained in:
Brad King
2021-05-21 14:39:15 +00:00
committed by Kitware Robot
parent 96995d38cd 820d3afb28
commit 2d3114c9b8
4 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Source/cmGeneratorTarget.cxx
View File

@@ -52,6 +52,11 @@
class cmMessenger;
namespace {
const cmsys::RegularExpression FrameworkRegularExpression(
"^(.*/)?([^/]*)\\.framework/(.*)$");
}
template <>
cmProp cmTargetPropertyComputer::GetSources<cmGeneratorTarget>(
cmGeneratorTarget const* tgt, cmMessenger* /* messenger */,
@@ -2257,8 +2262,16 @@ std::string cmGeneratorTarget::GetSOName(const std::string& config) const
return cmSystemTools::GetFilenameName(info->Location);
}
// Use the soname given if any.
if (this->IsFrameworkOnApple()) {
cmsys::RegularExpressionMatch match;
if (FrameworkRegularExpression.find(info->SOName.c_str(), match)) {
auto frameworkName = match.match(2);
auto fileName = match.match(3);
return cmStrCat(frameworkName, ".framework/", fileName);
}
}
if (cmHasLiteralPrefix(info->SOName, "@rpath/")) {
return info->SOName.substr(6);
return info->SOName.substr(cmStrLen("@rpath/"));
}
return info->SOName;
}
@@ -6459,9 +6472,19 @@ std::string cmGeneratorTarget::GetDirectory(
const std::string& config, cmStateEnums::ArtifactType artifact) const
{
if (this->IsImported()) {
auto fullPath = this->Target->ImportedGetFullPath(config, artifact);
if (this->IsFrameworkOnApple()) {
cmsys::RegularExpressionMatch match;
if (FrameworkRegularExpression.find(fullPath.c_str(), match)) {
auto path = match.match(1);
if (!path.empty()) {
path.erase(path.length() - 1);
}
return path;
}
}
// Return the directory from which the target is imported.
return cmSystemTools::GetFilenamePath(
this->Target->ImportedGetFullPath(config, artifact));
return cmSystemTools::GetFilenamePath(fullPath);
}
if (OutputInfo const* info = this->GetOutputInfo(config)) {
// Return the directory in which the target will be built.

1
Tests/RunCMake/Framework/ImportedFrameworkTest-build-stdout.txt Normal file
View File

@@ -0,0 +1 @@
xxx/no/exist/fw\.framework/Versions/A/fwxxx

10
Tests/RunCMake/Framework/ImportedFrameworkTest.cmake Normal file
View File

@@ -0,0 +1,10 @@
add_library(fw SHARED IMPORTED)
set_target_properties(fw PROPERTIES
FRAMEWORK TRUE
IMPORTED_LOCATION "/no/exist/fw.framework/Versions/A/fw"
IMPORTED_SONAME "@rpath/fw.framework/Versions/A/fw"
)
add_custom_target(print_fw ALL COMMAND
${CMAKE_COMMAND} -E echo "xxx$<TARGET_SONAME_FILE:fw>xxx"
)

12
Tests/RunCMake/Framework/RunCMakeTest.cmake
View File

@@ -81,3 +81,15 @@ function(framework_multi_config_postfix_test)
endfunction()
framework_multi_config_postfix_test()
function(imported_framework_test)
set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/ImportedFrameworkTest-build")
set(RunCMake_TEST_NO_CLEAN 1)
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
run_cmake(ImportedFrameworkTest)
run_cmake_command(ImportedFrameworkTest-build ${CMAKE_COMMAND} --build .)
endfunction()
imported_framework_test()