[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2811-gf988603

[Robert Maynard]

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  f988603bc6f15b9c9553653135b691343f5647c1 (commit)
       via  32b582d8a583fcaea92eff4b33af62ab0e10ceaa (commit)
      from  0eec6e7eddd33651a96c3d6aa708f7e8ca4e566e (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f988603bc6f15b9c9553653135b691343f5647c1
commit f988603bc6f15b9c9553653135b691343f5647c1
Merge: 0eec6e7 32b582d
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Thu Apr 18 15:18:06 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 18 15:18:06 2013 -0400

    Merge topic 'Cuda_WRAP_SRCS_duplicates' into next
    
    32b582d FindCUDA: Remove duplicate entries from INCLUDE_DIRECTORIES.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32b582d8a583fcaea92eff4b33af62ab0e10ceaa
commit 32b582d8a583fcaea92eff4b33af62ab0e10ceaa
Author:     Marcel Loose <loose at astron.nl>
AuthorDate: Thu Apr 18 14:48:17 2013 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Thu Apr 18 15:15:51 2013 -0400

    FindCUDA: Remove duplicate entries from INCLUDE_DIRECTORIES.
    
    As of CMake 2.8.8, the INCLUDE_DIRECTORIES() command does
    not de-duplicate entries. Failure to do so can lead to an extremely
    long and repetitive list of -I entries on the command line.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 423ad3d..6a1a27e 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -1021,7 +1021,10 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
   # Initialize our list of includes with the user ones followed by the CUDA system ones.
   set(CUDA_NVCC_INCLUDE_ARGS ${CUDA_NVCC_INCLUDE_ARGS_USER} "-I${CUDA_INCLUDE_DIRS}")
   # Get the include directories for this directory and use them for our nvcc command.
+  # Remove duplicate entries which may be present since include_directories
+  # in CMake >= 2.8.8 does not remove them.
   get_directory_property(CUDA_NVCC_INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES)
+  list(REMOVE_DUPLICATES CUDA_NVCC_INCLUDE_DIRECTORIES)
   if(CUDA_NVCC_INCLUDE_DIRECTORIES)
     foreach(dir ${CUDA_NVCC_INCLUDE_DIRECTORIES})
       list(APPEND CUDA_NVCC_INCLUDE_ARGS -I${dir})

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

Summary of changes:
 Modules/FindCUDA.cmake |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake