[Cmake-commits] CMake branch, next, updated. v2.8.4-1391-g8ce73ec
Mathieu Malaterre
mathieu.malaterre at gmail.com
Fri Apr 8 09:19:07 EDT 2011
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 8ce73ecf1c1b89d29c46a0054674356a26f5cea5 (commit)
via 0378396e68c39b27e3aebbf4268074f6d936fa6e (commit)
from 07702c8078f9fed3479536b22ba8a95692ca9dae (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=8ce73ecf1c1b89d29c46a0054674356a26f5cea5
commit 8ce73ecf1c1b89d29c46a0054674356a26f5cea5
Merge: 07702c8 0378396
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Fri Apr 8 09:19:05 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 8 09:19:05 2011 -0400
Merge topic 'fixbug_0011782' into next
0378396 UseSWIG.cmake did not support multiple modules and parallel builds
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0378396e68c39b27e3aebbf4268074f6d936fa6e
commit 0378396e68c39b27e3aebbf4268074f6d936fa6e
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Mon Mar 28 18:27:47 2011 +0200
Commit: Mathieu Malaterre <mathieu.malaterre at gmail.com>
CommitDate: Fri Apr 8 15:17:33 2011 +0200
UseSWIG.cmake did not support multiple modules and parallel builds
This commit fixes BUG: 0011782. UseSWIG would be using the same variable
to declare module information. The problem would only be noticed in parallel builds
Fix this variable declaration by properly resetting it.
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index b547dc7..76d03d1 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -69,6 +69,7 @@ ENDMACRO(SWIG_MODULE_INITIALIZE)
#
MACRO(SWIG_GET_EXTRA_OUTPUT_FILES language outfiles generatedpath infile)
+ SET(${outfiles} "")
GET_SOURCE_FILE_PROPERTY(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename
${infile} SWIG_MODULE_NAME)
IF(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename STREQUAL "NOTFOUND")
-----------------------------------------------------------------------
Summary of changes:
Modules/UseSWIG.cmake | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list