Browse Source

NinjaMultiConfig: CUDA executables generate symbols on windows

Robert Maynard 5 years ago
parent
commit
7f39ea3318

+ 5 - 0
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)

+ 1 - 0
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}