[Cmake-commits] CMake branch, master, updated. v3.9.0-388-gee79d7a

[Kitware Robot]

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  ee79d7a130465bce19864399a9adde4e79c6fd5c (commit)
       via  973ee6605bcbe9db18fd66032d6fc6654341ad84 (commit)
       via  70272f3c369f74c64bb0a535f5a6eb15253685a4 (commit)
       via  b4fbf677bbbb0a2789955f3d27ff24dd3ffac714 (commit)
      from  8e8bf4270734bda61acc3d0ae76c529e2e8b6834 (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=ee79d7a130465bce19864399a9adde4e79c6fd5c
commit ee79d7a130465bce19864399a9adde4e79c6fd5c
Merge: 973ee66 70272f3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 3 13:34:04 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Aug 3 09:34:15 2017 -0400

    Merge topic 'server-fix-crash'
    
    70272f3c server: Fix crash on missing cache entries
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1096


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=973ee6605bcbe9db18fd66032d6fc6654341ad84
commit 973ee6605bcbe9db18fd66032d6fc6654341ad84
Merge: 8e8bf42 b4fbf67
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 3 13:33:52 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Aug 3 09:33:57 2017 -0400

    Merge topic 'UseSWIG-Java-enabled'
    
    b4fbf677 UseSWIG: Fix when Java is enabled as a language
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1095


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70272f3c369f74c64bb0a535f5a6eb15253685a4
commit 70272f3c369f74c64bb0a535f5a6eb15253685a4
Author:     Laurent Rineau <laurent.rineau at cgal.org>
AuthorDate: Tue Jul 25 17:40:40 2017 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 2 16:13:55 2017 -0400

    server: Fix crash on missing cache entries
    
    Test for nullptr before constructing std::string.

diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index defba77..c5b7f60 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -284,7 +284,9 @@ static bool testValue(cmState* state, const std::string& key,
                       std::string& value, const std::string& keyDescription,
                       std::string* errorMessage)
 {
-  const std::string cachedValue = std::string(state->GetCacheEntryValue(key));
+  const char* entry = state->GetCacheEntryValue(key);
+  const std::string cachedValue =
+    entry == nullptr ? std::string() : std::string(entry);
   if (!cachedValue.empty() && !value.empty() && cachedValue != value) {
     setErrorMessage(errorMessage, std::string("\"") + key +
                       "\" is set but incompatible with configured " +

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4fbf677bbbb0a2789955f3d27ff24dd3ffac714
commit b4fbf677bbbb0a2789955f3d27ff24dd3ffac714
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 1 16:22:53 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 2 11:52:36 2017 -0400

    UseSWIG: Fix when Java is enabled as a language
    
    Since commit v3.8.0-rc1~251^2 (UseSWIG: Record generated java files as
    custom command outputs, 2016-11-28) the generated `.java` files are
    listed as sources in the call to `add_library` by swig_add_library.
    They are listed only as the outputs of custom commands and not intended
    for compilation as part of the library.
    
    Reported-by: Alan W. Irwin <irwin at beluga.phys.uvic.ca>

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index bfe1a6f..fc815dd 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -125,8 +125,10 @@ macro(SWIG_GET_EXTRA_OUTPUT_FILES language outfiles generatedpath infile)
 
   endif()
   foreach(it ${SWIG_${language}_EXTRA_FILE_EXTENSIONS})
-    set(${outfiles} ${${outfiles}}
-      "${generatedpath}/${SWIG_GET_EXTRA_OUTPUT_FILES_module_basename}${it}")
+    set(extra_file "${generatedpath}/${SWIG_GET_EXTRA_OUTPUT_FILES_module_basename}${it}")
+    list(APPEND ${outfiles} ${extra_file})
+    # Treat extra outputs as plain files regardless of language.
+    set_property(SOURCE "${extra_file}" PROPERTY LANGUAGE "")
   endforeach()
 endmacro()
 

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

Summary of changes:
 Modules/UseSWIG.cmake       |    6 ++++--
 Source/cmServerProtocol.cxx |    4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake