diff options
| -rw-r--r-- | Source/cmGeneratorTarget.h | 5 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/TargetObjects/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/TargetObjects/RunCMakeTest.cmake | 8 | ||||
| -rw-r--r-- | Tests/RunCMake/TargetObjects/Unity.cmake | 13 | ||||
| -rw-r--r-- | Tests/RunCMake/TargetObjects/UnityMain.c | 7 | ||||
| -rw-r--r-- | Tests/RunCMake/TargetObjects/UnityObj1.c | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/TargetObjects/UnityObj2.c | 4 |
9 files changed, 45 insertions, 7 deletions
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index fb56a0d..fd4b2ec 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -727,7 +727,10 @@ public: */ void ClearSourcesCache(); - // Do not use. This is only for a specific call site with a FIXME comment. + /** + * Clears cached evaluations of INTERFACE_LINK_LIBRARIES. + * They will be recomputed on demand. + */ void ClearLinkInterfaceCache(); void AddSource(const std::string& src, bool before = false); diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 71ab2a6..185bff9 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1922,9 +1922,13 @@ bool cmGlobalGenerator::AddAutomaticSources() // Clear the source list and classification cache (KindedSources) of all // targets so that it will be recomputed correctly by the generators later // now that the above transformations are done for all targets. + // Also clear the link interface cache to support $<TARGET_OBJECTS:objlib> + // in INTERFACE_LINK_LIBRARIES because the list of object files may have + // been changed by conversion to a unity build or addition of a PCH source. for (const auto& lg : this->LocalGenerators) { for (const auto& gt : lg->GetGeneratorTargets()) { gt->ClearSourcesCache(); + gt->ClearLinkInterfaceCache(); } } return true; diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 0e539fe..4afed43 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2864,15 +2864,10 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target) cm::nullopt, true); } else if (reuseTarget->GetType() == cmStateEnums::OBJECT_LIBRARY) { - // FIXME: This can propagate more than one level, unlike - // the rest of the object files in an object library. - // Find another way to do this. target->Target->AppendProperty( "INTERFACE_LINK_LIBRARIES", cmStrCat("$<$<CONFIG:", config, ">:$<LINK_ONLY:", pchSourceObj, ">>")); - // We updated the link interface, so ensure it is recomputed. - target->ClearLinkInterfaceCache(); } } } else { diff --git a/Tests/RunCMake/TargetObjects/CMakeLists.txt b/Tests/RunCMake/TargetObjects/CMakeLists.txt index e9a0a3f..86f640d 100644 --- a/Tests/RunCMake/TargetObjects/CMakeLists.txt +++ b/Tests/RunCMake/TargetObjects/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.5) project(${RunCMake_TEST} LANGUAGES NONE) include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/TargetObjects/RunCMakeTest.cmake b/Tests/RunCMake/TargetObjects/RunCMakeTest.cmake index d2b3032..9756255 100644 --- a/Tests/RunCMake/TargetObjects/RunCMakeTest.cmake +++ b/Tests/RunCMake/TargetObjects/RunCMakeTest.cmake @@ -6,3 +6,11 @@ run_cmake(NotObjlibTarget) if(RunCMake_GENERATOR STREQUAL "Xcode" AND "$ENV{CMAKE_OSX_ARCHITECTURES}" MATCHES "[;$]") run_cmake(XcodeVariableNoGenexExpansion) endif() + +function(run_cmake_and_build case) + set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${case}-build) + run_cmake(${case}) + set(RunCMake_TEST_NO_CLEAN 1) + run_cmake_command(${case}-build ${CMAKE_COMMAND} --build .) +endfunction() +run_cmake_and_build(Unity) diff --git a/Tests/RunCMake/TargetObjects/Unity.cmake b/Tests/RunCMake/TargetObjects/Unity.cmake new file mode 100644 index 0000000..9c8e5c9 --- /dev/null +++ b/Tests/RunCMake/TargetObjects/Unity.cmake @@ -0,0 +1,13 @@ +enable_language(C) + +# Test transforming the set of object files provided by an object library. +set(CMAKE_UNITY_BUILD 1) + +add_library(UnityObj1 OBJECT UnityObj1.c) +add_library(UnityObj2 OBJECT UnityObj2.c) + +add_library(UnityObj2Iface INTERFACE) +target_link_libraries(UnityObj2Iface INTERFACE $<TARGET_OBJECTS:UnityObj2>) + +add_executable(UnityMain UnityMain.c) +target_link_libraries(UnityMain PRIVATE UnityObj1 UnityObj2Iface) diff --git a/Tests/RunCMake/TargetObjects/UnityMain.c b/Tests/RunCMake/TargetObjects/UnityMain.c new file mode 100644 index 0000000..9d52ef8 --- /dev/null +++ b/Tests/RunCMake/TargetObjects/UnityMain.c @@ -0,0 +1,7 @@ +extern int UnityObj1(void); +extern int UnityObj2(void); + +int main(void) +{ + return UnityObj1() + UnityObj2(); +} diff --git a/Tests/RunCMake/TargetObjects/UnityObj1.c b/Tests/RunCMake/TargetObjects/UnityObj1.c new file mode 100644 index 0000000..ed19d14 --- /dev/null +++ b/Tests/RunCMake/TargetObjects/UnityObj1.c @@ -0,0 +1,4 @@ +int UnityObj1(void) +{ + return 0; +} diff --git a/Tests/RunCMake/TargetObjects/UnityObj2.c b/Tests/RunCMake/TargetObjects/UnityObj2.c new file mode 100644 index 0000000..1cc350c --- /dev/null +++ b/Tests/RunCMake/TargetObjects/UnityObj2.c @@ -0,0 +1,4 @@ +int UnityObj2(void) +{ + return 0; +} |