[Cmake-commits] CMake branch, next, updated. v3.4.1-1782-g46b3d79

[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  46b3d791b50efad69db00959244b2f8f738776f5 (commit)
       via  fa0cd33d066bd789e8c04f24547905c78dc2cc69 (commit)
      from  1d104f29c75e8cb264b94bd1fa916ae769e4cb18 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46b3d791b50efad69db00959244b2f8f738776f5
commit 46b3d791b50efad69db00959244b2f8f738776f5
Merge: 1d104f2 fa0cd33
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 18 09:16:04 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 18 09:16:04 2015 -0500

    Merge topic 'import-kwiml' into next
    
    fa0cd33d fixup! Port CMake from cmIML to KWIML


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa0cd33d066bd789e8c04f24547905c78dc2cc69
commit fa0cd33d066bd789e8c04f24547905c78dc2cc69
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 18 08:24:10 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 18 09:13:44 2015 -0500

    fixup! Port CMake from cmIML to KWIML

diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index 2adf317..db64559 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -36,7 +36,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
   "LINK : warning LNK4089: all references to.*SHELL32.dll.*discarded by /OPT:REF"
   "LINK : warning LNK4089: all references to.*USER32.dll.*discarded by /OPT:REF"
   "LINK : warning LNK4089: all references to.*ole32.dll.*discarded by /OPT:REF"
-  "Warning.*: .*/Utilities/KWIML/test/test_INT_format.h.* # Redundant preprocessing concatenation"
+  "Warning.*: .*/Utilities/KWIML/test/test_int_format.h.* # Redundant preprocessing concatenation"
   "Warning: library was too large for page size.*"
   "Warning: public.*_archive_.*in module.*archive_*clashes with prior module.*archive_.*"
   "Warning: public.*BZ2_bz.*in module.*bzlib.*clashes with prior module.*bzlib.*"
diff --git a/bootstrap b/bootstrap
index cb712c8..8b7a611 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1282,13 +1282,8 @@ for a in ${KWSYS_FILES}; do
      "${cmake_bootstrap_dir}/cmsys/${a}" KWSYS_NAMESPACE cmsys
 done
 
-cmake_generate_file "${cmake_bootstrap_dir}/cm_kwiml.h" "
-#include \"${cmake_source_dir}/Utilities/KWIML/include/kwiml/abi.h\"
-#include \"${cmake_source_dir}/Utilities/KWIML/include/kwiml/int.h\"
-"
-
 # Generate Makefile
-dep="cmConfigure.h cm_kwiml.h cmsys/*.hxx cmsys/*.h `cmake_escape \"${cmake_source_dir}\"`/Source/*.h"
+dep="cmConfigure.h cmsys/*.hxx cmsys/*.h `cmake_escape \"${cmake_source_dir}\"`/Source/*.h"
 objs=""
 for a in ${CMAKE_CXX_SOURCES} ${CMAKE_C_SOURCES} ${KWSYS_CXX_SOURCES} ${KWSYS_C_SOURCES}; do
   objs="${objs} ${a}.o"
@@ -1328,9 +1323,9 @@ cmake_cxx_flags_SystemTools="
   -DKWSYS_CXX_HAS_UTIMES=${KWSYS_CXX_HAS_UTIMES}
 "
 cmake_c_flags="${cmake_c_flags}-I`cmake_escape \"${cmake_bootstrap_dir}\"` -I`cmake_escape \"${cmake_source_dir}/Source\"` \
-  -I`cmake_escape \"${cmake_bootstrap_dir}\"`"
+  -I`cmake_escape \"${cmake_source_dir}/Utilities\"`"
 cmake_cxx_flags="${cmake_cxx_flags} -I`cmake_escape \"${cmake_bootstrap_dir}\"` -I`cmake_escape \"${cmake_source_dir}/Source\"` \
-  -I`cmake_escape \"${cmake_bootstrap_dir}\"`"
+  -I`cmake_escape \"${cmake_source_dir}/Utilities\"`"
 echo "cmake: ${objs}" > "${cmake_bootstrap_dir}/Makefile"
 echo "	${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} -o cmake" >> "${cmake_bootstrap_dir}/Makefile"
 for a in ${CMAKE_CXX_SOURCES}; do

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

Summary of changes:
 CTestCustom.cmake.in |    2 +-
 bootstrap            |   11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake