[Cmake-commits] CMake branch, next, updated. v2.8.4-1387-gbda35d6

[Mathieu Malaterre]

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  bda35d66bb29be4e4911d9567b76d444701f234f (commit)
       via  c08853651836aa0bae0494703cd4368451b738ae (commit)
      from  60b7a0d31dbaa010c4eecda1f90f4dfe3fdeeb2f (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=bda35d66bb29be4e4911d9567b76d444701f234f
commit bda35d66bb29be4e4911d9567b76d444701f234f
Merge: 60b7a0d c088536
Author:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Fri Apr 8 09:15:34 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 8 09:15:34 2011 -0400

    Merge topic 'fixbug_0011215' into next
    
    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}

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c08853651836aa0bae0494703cd4368451b738ae
commit c08853651836aa0bae0494703cd4368451b738ae
Author:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Mon Mar 28 18:12:26 2011 +0200
Commit:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
CommitDate: Fri Apr 8 15:13:57 2011 +0200

    UseSWIG.cmake does not expand $(OutDir)
    
    This commit fixes BUG: 0011215 by properly expanding $(OutDir)
    Instead of creating the output directory using file(MAKE_DIRECTORY)
    we use cmake -E to create the directory at execution time

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index b547dc7..486d03d 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -125,8 +125,6 @@ MACRO(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
   # If CMAKE_SWIG_OUTDIR was specified then pass it to -outdir
   IF(CMAKE_SWIG_OUTDIR)
     SET(swig_outdir ${CMAKE_SWIG_OUTDIR})
-    # it may not exist, so create it:
-    file(MAKE_DIRECTORY ${CMAKE_SWIG_OUTDIR})
   ELSE(CMAKE_SWIG_OUTDIR)
     SET(swig_outdir ${CMAKE_CURRENT_BINARY_DIR})
   ENDIF(CMAKE_SWIG_OUTDIR)
@@ -168,6 +166,8 @@ MACRO(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
   ENDIF(SWIG_MODULE_${name}_EXTRA_FLAGS)
   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