[Cmake-commits] CMake branch, master, updated. v2.8.4-347-gdff0096

Brad King brad.king at kitware.com
Tue Apr 12 14:44:11 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, master has been updated
       via  dff009626dc062657c6f433472c5a2d02cd0a14a (commit)
       via  c08853651836aa0bae0494703cd4368451b738ae (commit)
      from  bc888800f5c294bcb2233b2a9d8db2cef43bd744 (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=dff009626dc062657c6f433472c5a2d02cd0a14a
commit dff009626dc062657c6f433472c5a2d02cd0a14a
Merge: bc88880 c088536
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 12 14:44:09 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 12 14:44:09 2011 -0400

    Merge topic 'fixbug_0011215'
    
    c088536 UseSWIG.cmake does not expand $(OutDir)

diff --cc Modules/UseSWIG.cmake
index f9808c5,486d03d..6d3f1de
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@@ -221,12 -164,10 +219,14 @@@ MACRO(SWIG_ADD_SOURCE_TO_MODULE name ou
    IF(SWIG_MODULE_${name}_EXTRA_FLAGS)
      SET(swig_extra_flags ${swig_extra_flags} ${SWIG_MODULE_${name}_EXTRA_FLAGS})
    ENDIF(SWIG_MODULE_${name}_EXTRA_FLAGS)
 +  SWIG_GET_WRAPPER_DEPENDENCIES("${swig_source_file_fullname}"
 +    "${swig_generated_file_fullname}" ${SWIG_MODULE_${name}_SWIG_LANGUAGE_FLAG}
 +    swig_extra_dependencies)
 +  LIST(APPEND SWIG_MODULE_${name}_EXTRA_DEPS ${swig_extra_dependencies})
    ADD_CUSTOM_COMMAND(
      OUTPUT "${swig_generated_file_fullname}" ${swig_extra_generated_files}
+     # Let's create the ${swig_outdir} at execution time, in case dir contains $(OutDir)
+     COMMAND ${CMAKE_COMMAND} -E make_directory ${swig_outdir}
      COMMAND "${SWIG_EXECUTABLE}"
      ARGS "-${SWIG_MODULE_${name}_SWIG_LANGUAGE_FLAG}"
      ${swig_source_file_flags}

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

Summary of changes:
 Modules/UseSWIG.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list