[Cmake-commits] CMake branch, next, updated. v3.5.2-1565-g19ccdd0

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  19ccdd04e8128ff05f9c0beb062aa20b5d2b1742 (commit)
       via  6b190b5c5221d2447bdf19c20243469025d2614e (commit)
      from  fe005958b0079c029360b40364c11a96720714fb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19ccdd04e8128ff05f9c0beb062aa20b5d2b1742
commit 19ccdd04e8128ff05f9c0beb062aa20b5d2b1742
Merge: fe00595 6b190b5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 25 09:33:13 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 25 09:33:13 2016 -0400

    Merge topic 'FindCUDA-flags-genex' into next
    
    6b190b5c FindCUDA: Add support for generator expressions in CUDA_NVCC_FLAGS


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b190b5c5221d2447bdf19c20243469025d2614e
commit 6b190b5c5221d2447bdf19c20243469025d2614e
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Tue May 24 09:15:34 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 25 09:31:35 2016 -0400

    FindCUDA: Add support for generator expressions in CUDA_NVCC_FLAGS
    
    Follow the configure_file by a file(GENERATE) so the resulting cmake
    scripts used by FindCUDA for wrapping nvcc calls can now support
    generator expressions in the CUDA_NVCC_FLAGS variable.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 0718116..2979f0f 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -1395,7 +1395,8 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
       set(cmake_dependency_file "${cuda_compile_intermediate_directory}/${generated_file_basename}.depend")
       set(NVCC_generated_dependency_file "${cuda_compile_intermediate_directory}/${generated_file_basename}.NVCC-depend")
       set(generated_cubin_file "${generated_file_path}/${generated_file_basename}.cubin.txt")
-      set(custom_target_script "${cuda_compile_intermediate_directory}/${generated_file_basename}.cmake")
+      set(custom_target_script_pregen "${cuda_compile_intermediate_directory}/${generated_file_basename}.cmake.pre-gen")
+      set(custom_target_script "${cuda_compile_intermediate_directory}/${generated_file_basename}$<$<BOOL:$<CONFIG>>:.$<CONFIG>>.cmake")
 
       # Setup properties for obj files:
       if( NOT cuda_compile_to_external_module )
@@ -1436,7 +1437,11 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
       endif()
 
       # Configure the build script
-      configure_file("${CUDA_run_nvcc}" "${custom_target_script}" @ONLY)
+      configure_file("${CUDA_run_nvcc}" "${custom_target_script_pregen}" @ONLY)
+      file(GENERATE
+        OUTPUT "${custom_target_script}"
+        INPUT "${custom_target_script_pregen}"
+        )
 
       # So if a user specifies the same cuda file as input more than once, you
       # can have bad things happen with dependencies.  Here we check an option

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake