[Cmake-commits] CMake branch, next, updated. v2.8.4-1834-g4024a1a

[Brad King]

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  4024a1ac7c1730046181fc4c1de892ddfffe8f83 (commit)
       via  fc045318f846b66c0db94e25ab64658064107014 (commit)
      from  8cf4d72d0d49b9456e23d66212e06280fbe89543 (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=4024a1ac7c1730046181fc4c1de892ddfffe8f83
commit 4024a1ac7c1730046181fc4c1de892ddfffe8f83
Merge: 8cf4d72 fc04531
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 27 13:39:48 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 27 13:39:48 2011 -0400

    Merge topic 'revert-fixbug_0004147' into next
    
    fc04531 Revert "Add a new function SWIG_GET_WRAPPER_DEPENDENCIES to UseSWIG.cmake"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc045318f846b66c0db94e25ab64658064107014
commit fc045318f846b66c0db94e25ab64658064107014
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 27 12:51:05 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 27 13:36:01 2011 -0400

    Revert "Add a new function SWIG_GET_WRAPPER_DEPENDENCIES to UseSWIG.cmake"
    
    This reverts commit 1088b0278e74526298d0821589973918da33c44b.
    
    Wrapper dependency scanning (fix for #4147) does not work at CMake
    configuration time if an input file is provided by a custom command
    (regression #12307).  Revert to original behavior until a solution is
    found.

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index f9808c5..b547dc7 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -4,9 +4,6 @@
 #     - Define swig module with given name and specified language
 #   SWIG_LINK_LIBRARIES(name [ libraries ])
 #     - Link libraries to swig module
-#   SWIG_GET_WRAPPER_DEPENDENCIES(swigFile genWrapper language DEST_VARIABLE)
-#     - Put dependencies of the wrapper genWrapper generated by swig from
-#     swigFile in DEST_VARIABLE
 # All other macros are for internal use only.
 # To get the actual name of the swig module,
 # use: ${SWIG_MODULE_${name}_REAL_NAME}.
@@ -42,58 +39,6 @@ SET(SWIG_EXTRA_LIBRARIES "")
 SET(SWIG_PYTHON_EXTRA_FILE_EXTENSION "py")
 
 #
-# Get dependencies of the generated wrapper.
-#
-MACRO(SWIG_GET_WRAPPER_DEPENDENCIES swigFile genWrapper language DEST_VARIABLE)
-  GET_FILENAME_COMPONENT(swig_getdeps_basename ${swigFile} NAME_WE)
-  GET_FILENAME_COMPONENT(swig_getdeps_outdir ${genWrapper} PATH)
-  GET_SOURCE_FILE_PROPERTY(swig_getdeps_extra_flags "${swigFile}" SWIG_FLAGS)
-  IF("${swig_getdeps_extra_flags}" STREQUAL "NOTFOUND")
-    SET(swig_getdeps_extra_flags "")
-  ENDIF("${swig_getdeps_extra_flags}" STREQUAL "NOTFOUND")
-
-  IF(NOT swig_getdeps_outdir)
-    SET(swig_getdeps_outdir ${CMAKE_CURRENT_BINARY_DIR})
-  ENDIF(NOT swig_getdeps_outdir)
-  SET(swig_getdeps_depsfile
-    ${swig_getdeps_outdir}/swig_${swig_getdeps_basename}_deps.txt)
-  GET_DIRECTORY_PROPERTY(swig_getdeps_include_directories INCLUDE_DIRECTORIES)
-  SET(swig_getdeps_include_dirs)
-  FOREACH(it ${swig_getdeps_include_directories})
-    SET(swig_getdeps_include_dirs ${swig_getdeps_include_dirs} "-I${it}")
-  ENDFOREACH(it)
-  EXECUTE_PROCESS(
-    COMMAND ${SWIG_EXECUTABLE}
-    -MM -MF ${swig_getdeps_depsfile} ${swig_getdeps_extra_flags}
-    ${CMAKE_SWIG_FLAGS} -${language}
-    -o ${genWrapper} ${swig_getdeps_include_dirs} ${swigFile}
-    RESULT_VARIABLE swig_getdeps_result
-    ERROR_VARIABLE swig_getdeps_error
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  IF(NOT ${swig_getdeps_error} EQUAL 0)
-    MESSAGE(SEND_ERROR "Command \"${SWIG_EXECUTABLE} -MM -MF ${swig_getdeps_depsfile} ${swig_getdeps_extra_flags} ${CMAKE_SWIG_FLAGS} -${language} -o ${genWrapper} ${swig_getdeps_include_dirs} ${swigFile}\" failed with output:\n${swig_getdeps_error}")
-    SET(swig_getdeps_dependencies "")
-  ELSE(NOT ${swig_getdeps_error} EQUAL 0)
-    FILE(READ ${swig_getdeps_depsfile} ${DEST_VARIABLE})
-    # Remove the first line
-    STRING(REGEX REPLACE "^.+: +\\\\\n +" ""
-      ${DEST_VARIABLE} "${${DEST_VARIABLE}}")
-    # Clean the end of each line
-    STRING(REGEX REPLACE " +(\\\\)?\n" "\n" ${DEST_VARIABLE}
-      "${${DEST_VARIABLE}}")
-    # Clean beginning of each line
-    STRING(REGEX REPLACE "\n +" "\n"
-      ${DEST_VARIABLE} "${${DEST_VARIABLE}}")
-    # clean paths
-    STRING(REGEX REPLACE "\\\\\\\\" "/" ${DEST_VARIABLE}
-      "${${DEST_VARIABLE}}")
-    STRING(REGEX REPLACE "\n" ";"
-      ${DEST_VARIABLE} "${${DEST_VARIABLE}}")
-  ENDIF(NOT ${swig_getdeps_error} EQUAL 0)
-ENDMACRO(SWIG_GET_WRAPPER_DEPENDENCIES)
-
-
-#
 # For given swig module initialize variables associated with it
 #
 MACRO(SWIG_MODULE_INITIALIZE name language)
@@ -221,10 +166,6 @@ MACRO(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
   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}
     COMMAND "${SWIG_EXECUTABLE}"

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

Summary of changes:


hooks/post-receive
-- 
CMake