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

Merge topic 'ExternalProject-xcode-effective-platform'

Browse Source 
0a3caf0878 ExternalProject: Restore support for Xcode with an effective platform

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9517
This commit is contained in:
Brad King 2024-05-14 14:26:35 +00:00 committed by Kitware Robot
commit 26bbee30cc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/ExternalProject.cmake
View File

@ -2297,7 +2297,16 @@ function(_ep_get_configuration_subdir_genex suffix_var)
set(suffix "") set(suffix "")
get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(_isMultiConfig) if(_isMultiConfig)
set(suffix "/$<CONFIG>") if(CMAKE_GENERATOR STREQUAL "Xcode")
# The Xcode generator does not support per-config sources,
# so use the underlying build system's placeholder instead.
# FIXME(#23652): We have no test for the use case requiring
# CMAKE_CFG_INTDIR for XCODE_EMIT_EFFECTIVE_PLATFORM_NAME,
# but $<CONFIG> does not work.
set(suffix "/${CMAKE_CFG_INTDIR}")
else()
set(suffix "/$<CONFIG>")
endif()
endif() endif()
set(${suffix_var} "${suffix}" PARENT_SCOPE) set(${suffix_var} "${suffix}" PARENT_SCOPE)
endfunction() endfunction()