diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2023-02-02 21:53:26 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2023-02-03 16:24:56 (GMT) |
| commit | f34876561f018d20b26c5b322a37aff2b133850f (patch) | |
| tree | 241a249fd147a47e4eb9b4645bfff0e270c256f0 | |
| parent | 78cf427157d15ca39c0e3133e9d05eda532578d0 (diff) | |
| download | CMake-f34876561f018d20b26c5b322a37aff2b133850f.zip CMake-f34876561f018d20b26c5b322a37aff2b133850f.tar.gz CMake-f34876561f018d20b26c5b322a37aff2b133850f.tar.bz2 | |
Tests: Remove or silence instances of ${CMAKE_CFG_INTDIR}
| -rw-r--r-- | Tests/RunCMake/add_custom_command/WorkingDirectory.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/add_link_options/LINKER_expansion-list.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/add_custom_command/WorkingDirectory.cmake b/Tests/RunCMake/add_custom_command/WorkingDirectory.cmake index 65b7250..d8a5d86 100644 --- a/Tests/RunCMake/add_custom_command/WorkingDirectory.cmake +++ b/Tests/RunCMake/add_custom_command/WorkingDirectory.cmake @@ -2,7 +2,7 @@ add_custom_target(mkdir COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURR add_custom_command( OUTPUT out.txt COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/PrintDir.cmake - WORKING_DIRECTORY ${CMAKE_CFG_INTDIR} + WORKING_DIRECTORY $<CONFIG> ) set_property(SOURCE out.txt PROPERTY SYMBOLIC 1) add_custom_target(drive ALL DEPENDS out.txt) diff --git a/Tests/RunCMake/add_link_options/LINKER_expansion-list.cmake b/Tests/RunCMake/add_link_options/LINKER_expansion-list.cmake index c77b43c..f7c551d 100644 --- a/Tests/RunCMake/add_link_options/LINKER_expansion-list.cmake +++ b/Tests/RunCMake/add_link_options/LINKER_expansion-list.cmake @@ -11,7 +11,7 @@ string(REPLACE "${CMAKE_END_TEMP_FILE}" "" CMAKE_C_CREATE_SHARED_LIBRARY "${CMAK add_library(example SHARED LinkOptionsLib.c) # use LAUNCH facility to dump linker command -set_property(TARGET example PROPERTY RULE_LAUNCH_LINK "\"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/dump${CMAKE_EXECUTABLE_SUFFIX}\"") +set_property(TARGET example PROPERTY RULE_LAUNCH_LINK "\"$<TARGET_FILE:dump>\"") add_dependencies (example dump) |