[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5737-g5d08bec

Brad King brad.king at kitware.com
Mon Nov 25 08:34:33 EST 2013


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  5d08becaa6c388b7463b2a61121997d54a00f641 (commit)
       via  20028d600f643f06a2f4d8a429a02ce770e0c8a4 (commit)
      from  aab0a928b46da4b525726ce511be04754735f065 (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=5d08becaa6c388b7463b2a61121997d54a00f641
commit 5d08becaa6c388b7463b2a61121997d54a00f641
Merge: aab0a92 20028d6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 25 08:34:27 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 25 08:34:27 2013 -0500

    Merge topic 'UseSWIG-fix14520' into next
    
    20028d6 UseSWIG: Remove duplicate include dirs (#14520)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20028d600f643f06a2f4d8a429a02ce770e0c8a4
commit 20028d600f643f06a2f4d8a429a02ce770e0c8a4
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Sat Nov 23 08:57:04 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 25 08:33:30 2013 -0500

    UseSWIG: Remove duplicate include dirs (#14520)
    
    Shorten the swig command line.

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 00f3e21..f4aeebc 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -159,6 +159,7 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
   #message("Full path to source file: ${swig_source_file_fullname}")
   #message("Full path to the output file: ${swig_generated_file_fullname}")
   get_directory_property(cmake_include_directories INCLUDE_DIRECTORIES)
+  list(REMOVE_DUPLICATES cmake_include_directories)
   set(swig_include_dirs)
   foreach(it ${cmake_include_directories})
     set(swig_include_dirs ${swig_include_dirs} "-I${it}")

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

Summary of changes:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list