diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-07 14:52:23 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-02-07 09:52:32 -0500 |
| commit | 8c61f15cdc0cfb706391ee354482555f1bc08232 (patch) | |
| tree | a57400fd3a633516d14726475534885f5bd25a82 /Modules | |
| parent | 9bef06d0a58d0b20c1bf11e005a9898c05e2eb14 (diff) | |
| parent | 2b17b6da6acadc6676c342924bb10e2d944bf0f3 (diff) | |
| download | cmake-8c61f15cdc0cfb706391ee354482555f1bc08232.tar.gz | |
Merge topic 'avoid-cmake-cfg-intdir'
2b17b6da6a cmGlobalGenerator: Avoid referencing CMAKE_CFG_INTDIR
f34876561f Tests: Remove or silence instances of ${CMAKE_CFG_INTDIR}
78cf427157 RULE_LAUNCH_*: Add support for generator expressions
cabad8a37f ExternalProject: Always use $<CONFIG> for source files
62e8884d3f CTestTargets: Use $<CONFIG> instead of ${CMAKE_CFG_INTDIR}
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8169
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CTestTargets.cmake | 2 | ||||
| -rw-r--r-- | Modules/ExternalProject.cmake | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Modules/CTestTargets.cmake b/Modules/CTestTargets.cmake index b91b48eec4..99ef8e50c3 100644 --- a/Modules/CTestTargets.cmake +++ b/Modules/CTestTargets.cmake @@ -41,7 +41,7 @@ set(__conf_types "") get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) if(_isMultiConfig) # We need to pass the configuration type on the test command line. - set(__conf_types -C "${CMAKE_CFG_INTDIR}") + set(__conf_types -C "$<CONFIG>") endif() # Add convenience targets. Do this at most once in case of nested diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 3752cebad7..18068cb391 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -2091,13 +2091,7 @@ function(_ep_get_configuration_subdir_genex suffix_var) set(suffix "") get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) if(_isMultiConfig) - if(CMAKE_GENERATOR STREQUAL "Xcode") - # The Xcode generator does not support per-config sources, - # so use the underlying build system's placeholder instead. - set(suffix "/${CMAKE_CFG_INTDIR}") - else() - set(suffix "/$<CONFIG>") - endif() + set(suffix "/$<CONFIG>") endif() set(${suffix_var} "${suffix}" PARENT_SCOPE) endfunction() |