diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-20 14:51:06 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-07-21 11:46:15 -0400 |
| commit | cb777dd81e71746fcd324dc157d1b41f3ae3ce24 (patch) | |
| tree | dc65d54ee402350b352b079c37f195b7e0ff42c4 /Tests/RunCMake/NinjaMultiConfig/Simple.cmake | |
| parent | 83c82722808eb3f6c38b9069c95960378446afbb (diff) | |
| download | cmake-cb777dd81e71746fcd324dc157d1b41f3ae3ce24.tar.gz | |
Ninja Multi-Config: Restore TARGET_OBJECTS support in cross-configs
Since commit 2ae72ef74b (Xcode: Enable multi-arch TARGET_OBJECTS genex
in [INTERFACE_]LINK_LIBRARIES, 2021-05-26, v3.21.0-rc1~126^2) the
TARGET_OBJECTS genex, when referenced for linking, is now evaluated with
EvaluateForBuildsystem enabled. This causes the object file paths to be
computed with a buildsystem-specific placeholder for the configuration.
This is normally fine because the placeholder will be evaluated by the
native buildsystem tool using the proper configuration. However, the
Ninja Multi-Config generator's `${CONFIGURATION}` placeholder may not
have the correct value for cross-config object files. Switch back to
using the per-config location of each object file for this generator.
Fixes: #22436
Diffstat (limited to 'Tests/RunCMake/NinjaMultiConfig/Simple.cmake')
| -rw-r--r-- | Tests/RunCMake/NinjaMultiConfig/Simple.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/NinjaMultiConfig/Simple.cmake b/Tests/RunCMake/NinjaMultiConfig/Simple.cmake index 3f4ecbed24..e2d393b6fb 100644 --- a/Tests/RunCMake/NinjaMultiConfig/Simple.cmake +++ b/Tests/RunCMake/NinjaMultiConfig/Simple.cmake @@ -10,6 +10,6 @@ add_subdirectory(SimpleSubdir) add_library(simplestatic STATIC simplelib.c) include(${CMAKE_CURRENT_LIST_DIR}/Common.cmake) -generate_output_files(simpleexe simpleshared simplestatic simpleobj) +generate_output_files(simpleexe simpleexe2 simpleshared simplestatic simpleobj) file(APPEND "${CMAKE_BINARY_DIR}/target_files.cmake" "set(GENERATED_FILES [==[${CMAKE_BINARY_DIR}/empty.cmake]==])\n") |