echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure targets which are frameworks can be used freely

Browse Source 
Ensure flag -F/path/to/framework is specified during compilation step
of consumers of the framework.

Fixes: #23336
This commit is contained in:
Marc Chevrier 2022-03-27 16:08:11 +02:00
parent 2a88b807ce
commit 45ac71d8bc
6 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmComputeLinkInformation.cxx
View File

@ -1555,8 +1555,7 @@ void cmComputeLinkInformation::AddTargetItem(LinkEntry const& entry)
this->AddLibraryFeature("FRAMEWORK");
}
if (cmHasSuffix(entry.Feature, "FRAMEWORK"_s) &&
target->IsFrameworkOnApple() && !this->GlobalGenerator->IsXcode()) {
if (target->IsFrameworkOnApple() && !this->GlobalGenerator->IsXcode()) {
// Add the framework directory and the framework item itself
auto fwItems = this->GlobalGenerator->SplitFrameworkPath(item.Value, true);
if (!fwItems) {
@ -1571,8 +1570,15 @@ void cmComputeLinkInformation::AddTargetItem(LinkEntry const& entry)
// Add the directory portion to the framework search path.
this->AddFrameworkPath(fwItems->first);
}
this->Items.emplace_back(fwItems->second, ItemIsPath::Yes, target,
this->FindLibraryFeature(entry.Feature));
if (cmHasSuffix(entry.Feature, "FRAMEWORK"_s)) {
this->Items.emplace_back(fwItems->second, ItemIsPath::Yes, target,
this->FindLibraryFeature(entry.Feature));
} else {
this->Items.emplace_back(
item, ItemIsPath::Yes, target,
this->FindLibraryFeature(
entry.Feature == DEFAULT ? "__CMAKE_LINK_LIBRARY" : entry.Feature));
}
} else {
// Now add the full path to the library.
this->Items.emplace_back(

15
Tests/RunCMake/Framework/FrameworkConsumption.cmake Normal file
View File

@ -0,0 +1,15 @@
cmake_minimum_required(VERSION 3.22...3.24)
enable_language(C)
# Create framework and ensure header is placed in Headers
set(input_header "${CMAKE_SOURCE_DIR}/Gui.h")
add_library(Gui SHARED Gui.c "${input_header}")
set_target_properties(Gui PROPERTIES
PUBLIC_HEADER "${input_header}"
FRAMEWORK TRUE
)
add_executable(app main.c)
target_link_libraries(app PRIVATE Gui)

5
Tests/RunCMake/Framework/Gui.c Normal file
View File

@ -0,0 +1,5 @@
int foo(void)
{
return 0;
}

2
Tests/RunCMake/Framework/Gui.h Normal file
View File

@ -0,0 +1,2 @@
int foo(void);

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

@ -105,3 +105,15 @@ function(framework_system_include_test)
endfunction()
framework_system_include_test()
function(framework_consumption)
set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/FrameworkConsumption-build")
set(RunCMake_TEST_NO_CLEAN 1)
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
run_cmake(FrameworkConsumption)
run_cmake_command(FrameworkConsumption-build ${CMAKE_COMMAND} --build .)
endfunction()
framework_consumption()

9
Tests/RunCMake/Framework/main.c Normal file
View File

@ -0,0 +1,9 @@
#include <Gui/Gui.h>
int main()
{
foo();
return 0;
}