diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-03 16:48:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-03 16:48:08 (GMT) |
| commit | adf5524689d7621fa363a6d456c1e3de561b3688 (patch) | |
| tree | 7b272ad3c06a1dc52541d5d3631cd629b6248edc /Tests | |
| parent | 3a17ef5f230625f1fd87130c286763e69a4fe382 (diff) | |
| parent | 7f39ea3318ee8b1455640c4b48cabf808e24cd71 (diff) | |
| download | CMake-adf5524689d7621fa363a6d456c1e3de561b3688.zip CMake-adf5524689d7621fa363a6d456c1e3de561b3688.tar.gz CMake-adf5524689d7621fa363a6d456c1e3de561b3688.tar.bz2 | |
Merge topic 'ninja_multi_config_test_understand_win_cuda'
7f39ea3318 NinjaMultiConfig: CUDA executables generate symbols on windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4310
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/NinjaMultiConfig/Common.cmake | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/NinjaMultiConfig/CudaSimple-debug-target-build-check.cmake | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Tests/RunCMake/NinjaMultiConfig/Common.cmake b/Tests/RunCMake/NinjaMultiConfig/Common.cmake index e13bd53..6c0d82a 100644 --- a/Tests/RunCMake/NinjaMultiConfig/Common.cmake +++ b/Tests/RunCMake/NinjaMultiConfig/Common.cmake @@ -36,6 +36,11 @@ function(generate_output_files) if(type MATCHES "^(EXECUTABLE)$") set(exe_file " [==[$<TARGET_FILE_DIR:${tgt}>/$<TARGET_FILE_PREFIX:${tgt}>$<TARGET_FILE_BASE_NAME:${tgt}>$<TARGET_FILE_SUFFIX:${tgt}>]==]") set(exe_filename " [==[$<TARGET_FILE_PREFIX:${tgt}>$<TARGET_FILE_BASE_NAME:${tgt}>$<TARGET_FILE_SUFFIX:${tgt}>]==]") + + if(WIN32) + set(exe_lib_file " [==[$<TARGET_FILE_DIR:${tgt}>/$<TARGET_FILE_PREFIX:${tgt}>$<TARGET_FILE_BASE_NAME:${tgt}>.lib]==]") + string(APPEND content "set(TARGET_EXE_LIB_FILE_${tgt}_$<CONFIG>${exe_lib_file})\n") + endif() else() set(exe_file) set(exe_filename) diff --git a/Tests/RunCMake/NinjaMultiConfig/CudaSimple-debug-target-build-check.cmake b/Tests/RunCMake/NinjaMultiConfig/CudaSimple-debug-target-build-check.cmake index b0fca18..39db5ff 100644 --- a/Tests/RunCMake/NinjaMultiConfig/CudaSimple-debug-target-build-check.cmake +++ b/Tests/RunCMake/NinjaMultiConfig/CudaSimple-debug-target-build-check.cmake @@ -3,6 +3,7 @@ check_files("${RunCMake_TEST_BINARY_DIR}" ${GENERATED_FILES} ${TARGET_FILE_simplecudaexe_Debug} + ${TARGET_EXE_LIB_FILE_simplecudaexe_Debug} ${TARGET_OBJECT_FILES_simplecudaexe_Debug} ${TARGET_FILE_simplecudashared_Debug} |