[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-294-gaf782d0

2016-10-21 Thread 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  af782d021345506bb4e0d1e832a7b77fb8a0b12a (commit)
  from  1e555a44aa4e3d40bca2f88915c9f957098e5a55 (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=af782d021345506bb4e0d1e832a7b77fb8a0b12a
commit af782d021345506bb4e0d1e832a7b77fb8a0b12a
Author: Kitware Robot 
AuthorDate: Sat Oct 22 00:01:04 2016 -0400
Commit: Kitware Robot 
CommitDate: Sat Oct 22 00:01:04 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 149e14d..05b766b 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 7)
-set(CMake_VERSION_PATCH 20161021)
+set(CMake_VERSION_PATCH 20161022)
 #set(CMake_VERSION_RC 1)

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-667-ga8102f9

2016-10-21 Thread Daniel Pfeifer 
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  a8102f933066923c47ed35e0125a5c2e0940a4e8 (commit)
   via  719a9e8f89a9b6f9bfd78638b62907062a84d535 (commit)
  from  1a8f42e50f1435c05479ad3039e27d6c842a69fd (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=a8102f933066923c47ed35e0125a5c2e0940a4e8
commit a8102f933066923c47ed35e0125a5c2e0940a4e8
Merge: 1a8f42e 719a9e8
Author: Daniel Pfeifer 
AuthorDate: Fri Oct 21 17:53:16 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 21 17:53:16 2016 -0400

Merge topic 'cm_unordered_map' into next

719a9e8f Introduce CM_UNORDERED_MAP


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=719a9e8f89a9b6f9bfd78638b62907062a84d535
commit 719a9e8f89a9b6f9bfd78638b62907062a84d535
Author: Daniel Pfeifer 
AuthorDate: Fri Oct 21 23:52:51 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Fri Oct 21 23:52:51 2016 +0200

Introduce CM_UNORDERED_MAP

diff --git a/Source/cmDefinitions.h b/Source/cmDefinitions.h
index 569b3a2..8dfb9ea 100644
--- a/Source/cmDefinitions.h
+++ b/Source/cmDefinitions.h
@@ -6,20 +6,11 @@
 #include 
 
 #include "cmLinkedTree.h"
+#include "cm_unordered_map.hxx"
 
 #include 
 #include 
 
-#if defined(CMAKE_BUILD_WITH_CMAKE)
-#ifdef CMake_HAVE_CXX_UNORDERED_MAP
-#include 
-#else
-#include "cmsys/hash_map.hxx"
-#endif
-#else
-#include 
-#endif
-
 /** \class cmDefinitions
  * \brief Store a scope of variable definitions for CMake language.
  *
@@ -85,15 +76,7 @@ private:
   };
   static Def NoDef;
 
-#if defined(CMAKE_BUILD_WITH_CMAKE)
-#ifdef CMake_HAVE_CXX_UNORDERED_MAP
-  typedef std::unordered_map MapType;
-#else
-  typedef cmsys::hash_map MapType;
-#endif
-#else
-  typedef std::map MapType;
-#endif
+  typedef CM_UNORDERED_MAP MapType;
   MapType Map;
 
   static Def const& GetInternal(const std::string& key, StackIter begin,
diff --git a/Source/cmFileTimeComparison.cxx b/Source/cmFileTimeComparison.cxx
index a6c9cd0..55d8c2a 100644
--- a/Source/cmFileTimeComparison.cxx
+++ b/Source/cmFileTimeComparison.cxx
@@ -7,14 +7,7 @@
 #include 
 #include 
 
-// Use a hash table to avoid duplicate file time checks from disk.
-#if defined(CMAKE_BUILD_WITH_CMAKE)
-#ifdef CMake_HAVE_CXX_UNORDERED_MAP
-#include 
-#else
-#include 
-#endif
-#endif
+#include "cm_unordered_map.hxx"
 
 // Use a platform-specific API to get file times efficiently.
 #if !defined(_WIN32) || defined(__CYGWIN__)
@@ -35,27 +28,9 @@ public:
   bool FileTimesDiffer(const char* f1, const char* f2);
 
 private:
-#if defined(CMAKE_BUILD_WITH_CMAKE)
-  // Use a hash table to efficiently map from file name to modification time.
-  class HashString
-  {
-  public:
-size_t operator()(const std::string& s) const { return h(s.c_str()); }
-#ifdef CMake_HAVE_CXX_UNORDERED_MAP
-std::hash h;
-#else
-cmsys::hash h;
-#endif
-  };
-#ifdef CMake_HAVE_CXX_UNORDERED_MAP
-  typedef std::unordered_map
+  typedef CM_UNORDERED_MAP
 FileStatsMap;
   FileStatsMap Files;
-#endif
 
   // Internal methods to lookup and compare modification times.
   inline bool Stat(const char* fname, cmFileTimeComparison_Type* st);
@@ -68,7 +43,6 @@ private:
 bool cmFileTimeComparisonInternal::Stat(const char* fname,
 cmFileTimeComparison_Type* st)
 {
-#if defined(CMAKE_BUILD_WITH_CMAKE)
   // Use the stored time if available.
   cmFileTimeComparisonInternal::FileStatsMap::iterator fit =
 this->Files.find(fname);
@@ -76,7 +50,6 @@ bool cmFileTimeComparisonInternal::Stat(const char* fname,
 *st = fit->second;
 return true;
   }
-#endif
 
 #if !defined(_WIN32) || defined(__CYGWIN__)
   // POSIX version.  Use the stat function.
@@ -97,11 +70,8 @@ bool cmFileTimeComparisonInternal::Stat(const char* fname,
   *st = fdata.ftLastWriteTime;
 #endif
 
-#if defined(CMAKE_BUILD_WITH_CMAKE)
   // Store the time for future use.
   this->Files[fname] = *st;
-#endif
-
   return true;
 }
 
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index d8d47a1..4bf4bd1 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -12,6 +12,7 @@
 #include "cmTarget.h"
 #include "cmTargetDepend.h"
 #include "cm_codecvt.hxx"
+#include "cm_unordered_map.hxx"
 
 #include 
 #include 
@@ -22,11 +23,6 @@
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 #include "cmFileLockPool.h"
-#ifdef CMake_HAVE_CXX_UNORDERED_MAP
-#include 
-#else
-#include 
-#endif
 #endif
 
 class cmCustomCommandLines;
@@ -468,22 +464,9 @@ protected:
   const char* GetPredefinedTargetsFolder();
 
 private:
-#if defined(CMAKE_BUILD_WITH_CMAKE)
-#ifdef CMake_HAVE_CXX_UNORDERED_M

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-665-g1a8f42e

2016-10-21 Thread Daniel Pfeifer 
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  1a8f42e50f1435c05479ad3039e27d6c842a69fd (commit)
   via  32040cd3aefa07524d64f65340bdc2b7e1cca513 (commit)
  from  35e25ada0edbcd6a36204ea13a4da8309dab3cfc (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=1a8f42e50f1435c05479ad3039e27d6c842a69fd
commit 1a8f42e50f1435c05479ad3039e27d6c842a69fd
Merge: 35e25ad 32040cd
Author: Daniel Pfeifer 
AuthorDate: Fri Oct 21 15:41:30 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 21 15:41:30 2016 -0400

Merge topic 'separate-compilation' into next

32040cd3 Fix newly discovered clang-tidy issues


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32040cd3aefa07524d64f65340bdc2b7e1cca513
commit 32040cd3aefa07524d64f65340bdc2b7e1cca513
Author: Daniel Pfeifer 
AuthorDate: Fri Oct 21 21:32:43 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Fri Oct 21 21:32:43 2016 +0200

Fix newly discovered clang-tidy issues

Clang-tidy reports some issues only from the currently compiled source
file and its associated header file.  Separating the compilation of
commands exposed some clang-tidy issues that were not reported previously.
Fix them.

diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index 18118a3..56cf91a 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -270,8 +270,8 @@ bool 
cmAddLibraryCommand::InitialPass(std::vector const& args,
 yet its linker language. */
   if ((type == cmStateEnums::SHARED_LIBRARY ||
type == cmStateEnums::MODULE_LIBRARY) &&
-  (this->Makefile->GetState()->GetGlobalPropertyAsBool(
- "TARGET_SUPPORTS_SHARED_LIBS") == false)) {
+  !this->Makefile->GetState()->GetGlobalPropertyAsBool(
+"TARGET_SUPPORTS_SHARED_LIBS")) {
 std::ostringstream w;
 w << "ADD_LIBRARY called with "
   << (type == cmStateEnums::SHARED_LIBRARY ? "SHARED" : "MODULE")
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index 4c0b649..7d98e73 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -222,7 +222,7 @@ bool cmConditionEvaluator::GetBooleanValue(
 double d = strtod(arg.c_str(), &end);
 if (*end == '\0') {
   // The whole string is a number.  Use C conversion to bool.
-  return d ? true : false;
+  return static_cast(d);
 }
   }
 
@@ -444,7 +444,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList& 
newArgs, std::string&,
   if (this->IsKeyword(keyCOMMAND, *arg) && argP1 != newArgs.end()) {
 cmCommand* command =
   this->Makefile.GetState()->GetCommand(argP1->c_str());
-this->HandlePredicate(command ? true : false, reducible, arg, newArgs,
+this->HandlePredicate(command != CM_NULLPTR, reducible, arg, newArgs,
   argP1, argP2);
   }
   // does a policy exist
@@ -456,7 +456,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList& 
newArgs, std::string&,
   // does a target exist
   if (this->IsKeyword(keyTARGET, *arg) && argP1 != newArgs.end()) {
 this->HandlePredicate(
-  this->Makefile.FindTargetToUse(argP1->GetValue()) ? true : false,
+  this->Makefile.FindTargetToUse(argP1->GetValue()) != CM_NULLPTR,
   reducible, arg, newArgs, argP1, argP2);
   }
   // does a test exist
@@ -464,7 +464,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList& 
newArgs, std::string&,
   this->Policy64Status != cmPolicies::WARN) {
 if (this->IsKeyword(keyTEST, *arg) && argP1 != newArgs.end()) {
   const cmTest* haveTest = this->Makefile.GetTest(argP1->c_str());
-  this->HandlePredicate(haveTest ? true : false, reducible, arg,
+  this->HandlePredicate(haveTest != CM_NULLPTR, reducible, arg,
 newArgs, argP1, argP2);
 }
   } else if (this->Policy64Status == cmPolicies::WARN &&
@@ -638,8 +638,8 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList& 
newArgs,
 bool success = cmSystemTools::FileTimeCompare(
   arg->GetValue(), (argP2)->GetValue(), &fileIsNewer);
 this->HandleBinaryOp(
-  (success == false || fileIsNewer == 1 || fileIsNewer == 0),
-  reducible, arg, newArgs, argP1, argP2);
+  (!success || fileIsNewer == 1 || fileIsNewer == 0), reducible, arg,
+  newArgs, argP1, argP2);
   }
 
   if (argP1 != newArgs.end() && argP2 != newArgs.end() &&
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-663-g35e25ad

2016-10-21 Thread Daniel Pfeifer 
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  35e25ada0edbcd6a36204ea13a4da8309dab3cfc (commit)
   via  14f1a9d044504d831fe34e711f4e54da4d3f2d08 (commit)
   via  2b7eb72ebdd57a7c61075cad0fa6c7f3947f6e54 (commit)
   via  4bb235357a363646685f6595b6ea501becb74813 (commit)
   via  b500bd327a4565bb85c0ef3585ad7c36aac5d8c5 (commit)
   via  3e330d8805c29f00ff550b37f50add3d009c93d7 (commit)
   via  75fbf9008092484c869d6e075d9c8a056ad8c331 (commit)
  from  5b23ea48ac45f2b08ec1941c291608737ec16555 (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=35e25ada0edbcd6a36204ea13a4da8309dab3cfc
commit 35e25ada0edbcd6a36204ea13a4da8309dab3cfc
Merge: 5b23ea4 14f1a9d
Author: Daniel Pfeifer 
AuthorDate: Fri Oct 21 14:27:25 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 21 14:27:25 2016 -0400

Merge topic 'separate-compilation' into next

14f1a9d0 cmCommand: implement functions in cxx file
2b7eb72e bootstrap: Sort source files lexicographically
4bb23535 Create all commands from a single function
b500bd32 Separate compilation for commands included in cmBootstrapCommands2
3e330d88 Separate compilation for commands included in cmBootstrapCommands1
75fbf900 Separate compilation for commands included in cmCommands


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14f1a9d044504d831fe34e711f4e54da4d3f2d08
commit 14f1a9d044504d831fe34e711f4e54da4d3f2d08
Author: Daniel Pfeifer 
AuthorDate: Thu Oct 20 00:29:18 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Fri Oct 21 18:14:51 2016 +0200

cmCommand: implement functions in cxx file

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index b2617ae..09c0acf 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -386,6 +386,8 @@ set(SRCS
   cmake.cxx
   cmake.h
 
+  cmCommand.cxx
+  cmCommand.h
   cmCommands.cxx
   cmCommands.h
   cmAddCompileOptionsCommand.cxx
diff --git a/Source/cmCommand.cxx b/Source/cmCommand.cxx
new file mode 100644
index 000..3c839de
--- /dev/null
+++ b/Source/cmCommand.cxx
@@ -0,0 +1,48 @@
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+   file Copyright.txt or https://cmake.org/licensing for details.  */
+#include "cmCommand.h"
+
+bool cmCommand::InvokeInitialPass(const std::vector& args,
+  cmExecutionStatus& status)
+{
+  std::vector expandedArguments;
+  if (!this->Makefile->ExpandArguments(args, expandedArguments)) {
+// There was an error expanding arguments.  It was already
+// reported, so we can skip this command without error.
+return true;
+  }
+  return this->InitialPass(expandedArguments, status);
+}
+
+const char* cmCommand::GetError()
+{
+  if (this->Error.empty()) {
+this->Error = this->GetName();
+this->Error += " unknown error.";
+  }
+  return this->Error.c_str();
+}
+
+void cmCommand::SetError(const std::string& e)
+{
+  this->Error = this->GetName();
+  this->Error += " ";
+  this->Error += e;
+}
+
+bool cmCommand::Disallowed(cmPolicies::PolicyID pol, const char* e)
+{
+  switch (this->Makefile->GetPolicyStatus(pol)) {
+case cmPolicies::WARN:
+  this->Makefile->IssueMessage(cmake::AUTHOR_WARNING,
+   cmPolicies::GetPolicyWarning(pol));
+case cmPolicies::OLD:
+  return false;
+case cmPolicies::REQUIRED_IF_USED:
+case cmPolicies::REQUIRED_ALWAYS:
+case cmPolicies::NEW:
+  this->Makefile->IssueMessage(cmake::FATAL_ERROR, e);
+  break;
+  }
+  return true;
+}
diff --git a/Source/cmCommand.h b/Source/cmCommand.h
index d8e337d..9299c71 100644
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@ -28,9 +28,9 @@ public:
* Construct the command. By default it is enabled with no makefile.
*/
   cmCommand()
+: Makefile(CM_NULLPTR)
+, Enabled(true)
   {
-this->Makefile = CM_NULLPTR;
-this->Enabled = true;
   }
 
   /**
@@ -50,16 +50,7 @@ public:
* arguments and then invokes the InitialPass.
*/
   virtual bool InvokeInitialPass(const std::vector& args,
- cmExecutionStatus& status)
-  {
-std::vector expandedArguments;
-if (!this->Makefile->ExpandArguments(args, expandedArguments)) {
-  // There was an error expanding arguments.  It was already
-  // reported, so we can skip this command without error.
-  return true;
-}
-return this->InitialPass(expandedArguments, status);
-  }
+ cmExecutionStatus& status);
 
   /**
* This is called when the command is first encountered in
@

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-656-g5b23ea4

2016-10-21 Thread Daniel Pfeifer 
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  5b23ea48ac45f2b08ec1941c291608737ec16555 (commit)
   via  e3770c56a8ef6b20f473556a1ca29ea6e0f51f7f (commit)
  from  174057f9e157e570a83cf7cd55a7e121d0f4c63c (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=5b23ea48ac45f2b08ec1941c291608737ec16555
commit 5b23ea48ac45f2b08ec1941c291608737ec16555
Merge: 174057f e3770c5
Author: Daniel Pfeifer 
AuthorDate: Fri Oct 21 14:06:54 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 21 14:06:54 2016 -0400

Merge topic 'parallel-boostrap-test' into next

e3770c56 BootstrapTest: Use --parallel=... argument.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3770c56a8ef6b20f473556a1ca29ea6e0f51f7f
commit e3770c56a8ef6b20f473556a1ca29ea6e0f51f7f
Author: Daniel Pfeifer 
AuthorDate: Fri Oct 21 18:18:18 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Fri Oct 21 18:22:44 2016 +0200

BootstrapTest: Use --parallel=... argument.

Determine the number of processors and provide it to the bootstrap
script.  Also make sure this test does not run parallel with other
tests.

diff --git a/Tests/BootstrapTest.cmake b/Tests/BootstrapTest.cmake
index 9c9fe09..07a65bf 100644
--- a/Tests/BootstrapTest.cmake
+++ b/Tests/BootstrapTest.cmake
@@ -1,7 +1,12 @@
 file(MAKE_DIRECTORY "${bin_dir}")
-message(STATUS "running bootstrap: ${bootstrap}")
+include(ProcessorCount)
+ProcessorCount(nproc)
+if(NOT nproc EQUAL 0)
+  set(parallel_arg --parallel=${nproc})
+endif()
+message(STATUS "running bootstrap: ${bootstrap} ${parallel_arg}")
 execute_process(
-  COMMAND ${bootstrap}
+  COMMAND ${bootstrap} ${parallel_arg}
   WORKING_DIRECTORY "${bin_dir}"
   RESULT_VARIABLE result
   )
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7df9403..5d72e5c 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -3081,8 +3081,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P 
${CMake_SOURCE_DIR}/Utilities/Release
 -P ${CMAKE_CURRENT_SOURCE_DIR}/BootstrapTest.cmake
   )
 list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BootstrapTest")
-# Make this test run early during parallel execution
-set_tests_properties(BootstrapTest PROPERTIES COST 5000)
+# This test will use all processors.
+set_tests_properties(BootstrapTest PROPERTIES RUN_SERIAL 1)
 
 # provide more time for the bootstrap test
 get_test_property(BootstrapTest TIMEOUT PREVIOUS_TIMEOUT)

---

Summary of changes:
 Tests/BootstrapTest.cmake |9 +++--
 Tests/CMakeLists.txt  |4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-654-g174057f

2016-10-21 Thread 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  174057f9e157e570a83cf7cd55a7e121d0f4c63c (commit)
   via  dfa9c54353b329a73f09314bd119224818a947fa (commit)
  from  4cfeac87fe0170b09b7c6a21a2f2dd0ff420d111 (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=174057f9e157e570a83cf7cd55a7e121d0f4c63c
commit 174057f9e157e570a83cf7cd55a7e121d0f4c63c
Merge: 4cfeac8 dfa9c54
Author: Brad King 
AuthorDate: Fri Oct 21 13:28:20 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 21 13:28:20 2016 -0400

Merge topic 'doc-cmake-server-typos' into next

dfa9c543 Revert "Help: Fix cmake-server typo and message type consistency"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfa9c54353b329a73f09314bd119224818a947fa
commit dfa9c54353b329a73f09314bd119224818a947fa
Author: Brad King 
AuthorDate: Fri Oct 21 13:28:06 2016 -0400
Commit: Brad King 
CommitDate: Fri Oct 21 13:28:06 2016 -0400

Revert "Help: Fix cmake-server typo and message type consistency"

This reverts commit f85bd200f947b6d4c89e9475a6a424b5b2270a16.

diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst
index fe479d1..afd4e2b 100644
--- a/Help/manual/cmake-server.7.rst
+++ b/Help/manual/cmake-server.7.rst
@@ -403,7 +403,7 @@ CMake will reply like this (after reporting progress for 
some time)::
 Type "compute"
 ^^
 
-This request will generate build system files in the build directory and
+This requist will generate build system files in the build directory and
 is only available after a project was successfully "configure"d.
 
 Example::
@@ -520,7 +520,7 @@ sourceDirectory of the target.
 Example::
 
   [== CMake Server ==[
-  {"type":"codemodel"}
+  {"type":"project"}
   ]== CMake Server ==]
 
 CMake will reply::
@@ -529,7 +529,7 @@ CMake will reply::
   {
 "cookie":"",
 "type":"reply",
-"inReplyTo":"codemodel",
+"inReplyTo":"project",
 
 "projects":
 [
@@ -584,9 +584,9 @@ CMake will reply::
   ]== CMake Server ==]
 
 The output can be tailored to the specific needs via parameter passed when
-requesting "codemodel" information.
+requesting "project" information.
 
-You can have a "depth" key, which accepts "codemodel", "configuration" and
+You can have a "depth" key, which accepts "project", "configuration" and
 "target" as string values. These cause the output to be trimmed at the
 appropriate depth of the output tree.
 

---

Summary of changes:
 Help/manual/cmake-server.7.rst |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-652-g4cfeac8

2016-10-21 Thread 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  4cfeac87fe0170b09b7c6a21a2f2dd0ff420d111 (commit)
   via  295c8efa359cbee22e45e6e9358990209b35aa39 (commit)
  from  98cc166c5565c2a57ff5e41c68d15dbb39e16aea (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=4cfeac87fe0170b09b7c6a21a2f2dd0ff420d111
commit 4cfeac87fe0170b09b7c6a21a2f2dd0ff420d111
Merge: 98cc166 295c8ef
Author: Brad King 
AuthorDate: Fri Oct 21 13:25:35 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 21 13:25:35 2016 -0400

Merge topic 'android-link-exe' into next

295c8efa Android: Add missing link flags for device executables


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=295c8efa359cbee22e45e6e9358990209b35aa39
commit 295c8efa359cbee22e45e6e9358990209b35aa39
Author: Brad King 
AuthorDate: Fri Oct 21 09:12:34 2016 -0400
Commit: Brad King 
CommitDate: Fri Oct 21 10:43:45 2016 -0400

Android: Add missing link flags for device executables

See `${ndk}/build/core/default-build-commands.mk` for link flags the NDK
uses for executables.  Add them to our default executable link flags.
Suppress `nocopyreloc` on `arm64-v8a` because it does not work with
some STL types.

Closes: #16380

diff --git a/Modules/Platform/Android-Common.cmake 
b/Modules/Platform/Android-Common.cmake
index 6544696..8755d4f 100644
--- a/Modules/Platform/Android-Common.cmake
+++ b/Modules/Platform/Android-Common.cmake
@@ -107,6 +107,7 @@ set(_ANDROID_ABI_INIT_CFLAGS "")
 set(_ANDROID_ABI_INIT_CFLAGS_DEBUG "")
 set(_ANDROID_ABI_INIT_CFLAGS_RELEASE "")
 set(_ANDROID_ABI_INIT_LDFLAGS "")
+set(_ANDROID_ABI_INIT_EXE_LDFLAGS "")
 
 macro(__android_compiler_common lang)
   if(_ANDROID_ABI_INIT_CFLAGS)
@@ -125,6 +126,9 @@ macro(__android_compiler_common lang)
   string(APPEND CMAKE_${t}_LINKER_FLAGS_INIT " 
${_ANDROID_ABI_INIT_LDFLAGS}")
 endforeach()
   endif()
+  if(_ANDROID_ABI_INIT_EXE_LDFLAGS)
+string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " 
${_ANDROID_ABI_INIT_EXE_LDFLAGS}")
+  endif()
 
   if(DEFINED _ANDROID_STL_EXCEPTIONS)
 if(_ANDROID_STL_EXCEPTIONS)
diff --git a/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake 
b/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
index 3ff1fe5..e56b67b 100644
--- a/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
+++ b/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
@@ -5,4 +5,7 @@ string(APPEND _ANDROID_ABI_INIT_CFLAGS
   " -fpic"
   )
 
+# Suppress -Wl,-z,nocopyreloc flag on arm64-v8a
+set(_ANDROID_ABI_INIT_EXE_LDFLAGS_NO_nocopyreloc 1)
+
 include(Platform/Android/abi-common-Clang)
diff --git a/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake 
b/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake
index 538ec2f..0bcfc86 100644
--- a/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake
+++ b/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake
@@ -3,4 +3,7 @@ string(APPEND _ANDROID_ABI_INIT_CFLAGS
   " -fpic"
   )
 
+# Suppress -Wl,-z,nocopyreloc flag on arm64-v8a
+set(_ANDROID_ABI_INIT_EXE_LDFLAGS_NO_nocopyreloc 1)
+
 include(Platform/Android/abi-common-GNU)
diff --git a/Modules/Platform/Android/abi-common.cmake 
b/Modules/Platform/Android/abi-common.cmake
index 12d8e5c..84e7dbd 100644
--- a/Modules/Platform/Android/abi-common.cmake
+++ b/Modules/Platform/Android/abi-common.cmake
@@ -2,3 +2,9 @@ string(APPEND _ANDROID_ABI_INIT_CFLAGS
   " -funwind-tables"
   " -no-canonical-prefixes"
   )
+
+string(APPEND _ANDROID_ABI_INIT_EXE_LDFLAGS " -Wl,--gc-sections")
+
+if(NOT _ANDROID_ABI_INIT_EXE_LDFLAGS_NO_nocopyreloc)
+  string(APPEND _ANDROID_ABI_INIT_EXE_LDFLAGS " -Wl,-z,nocopyreloc")
+endif()

---

Summary of changes:
 Modules/Platform/Android-Common.cmake  |4 
 Modules/Platform/Android/abi-arm64-v8a-Clang.cmake |3 +++
 Modules/Platform/Android/abi-arm64-v8a-GNU.cmake   |3 +++
 Modules/Platform/Android/abi-common.cmake  |6 ++
 4 files changed, 16 insertions(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-650-g98cc166

2016-10-21 Thread 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  98cc166c5565c2a57ff5e41c68d15dbb39e16aea (commit)
   via  f85bd200f947b6d4c89e9475a6a424b5b2270a16 (commit)
  from  1a54dc7196caedf938ef32655d13b05feb87e984 (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=98cc166c5565c2a57ff5e41c68d15dbb39e16aea
commit 98cc166c5565c2a57ff5e41c68d15dbb39e16aea
Merge: 1a54dc7 f85bd20
Author: Brad King 
AuthorDate: Fri Oct 21 10:40:14 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 21 10:40:14 2016 -0400

Merge topic 'doc-cmake-server-typos' into next

f85bd200 Help: Fix cmake-server typo and message type consistency


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f85bd200f947b6d4c89e9475a6a424b5b2270a16
commit f85bd200f947b6d4c89e9475a6a424b5b2270a16
Author: Sylvain Joubert 
AuthorDate: Fri Oct 21 15:46:12 2016 +0200
Commit: Brad King 
CommitDate: Fri Oct 21 10:35:24 2016 -0400

Help: Fix cmake-server typo and message type consistency

diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst
index afd4e2b..fe479d1 100644
--- a/Help/manual/cmake-server.7.rst
+++ b/Help/manual/cmake-server.7.rst
@@ -403,7 +403,7 @@ CMake will reply like this (after reporting progress for 
some time)::
 Type "compute"
 ^^
 
-This requist will generate build system files in the build directory and
+This request will generate build system files in the build directory and
 is only available after a project was successfully "configure"d.
 
 Example::
@@ -520,7 +520,7 @@ sourceDirectory of the target.
 Example::
 
   [== CMake Server ==[
-  {"type":"project"}
+  {"type":"codemodel"}
   ]== CMake Server ==]
 
 CMake will reply::
@@ -529,7 +529,7 @@ CMake will reply::
   {
 "cookie":"",
 "type":"reply",
-"inReplyTo":"project",
+"inReplyTo":"codemodel",
 
 "projects":
 [
@@ -584,9 +584,9 @@ CMake will reply::
   ]== CMake Server ==]
 
 The output can be tailored to the specific needs via parameter passed when
-requesting "project" information.
+requesting "codemodel" information.
 
-You can have a "depth" key, which accepts "project", "configuration" and
+You can have a "depth" key, which accepts "codemodel", "configuration" and
 "target" as string values. These cause the output to be trimmed at the
 appropriate depth of the output tree.
 

---

Summary of changes:
 Help/manual/cmake-server.7.rst |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-648-g1a54dc7

2016-10-21 Thread 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  1a54dc7196caedf938ef32655d13b05feb87e984 (commit)
   via  1e555a44aa4e3d40bca2f88915c9f957098e5a55 (commit)
   via  dd7f9d8393b4dfd470335e662bfb94aaf57f93e1 (commit)
   via  e094c8fa0aa3827b0e81660ad5e29d85b216d60f (commit)
   via  97670dbf2fa567998c26686caa4f03b6f4e78967 (commit)
   via  ac394fddab4c4407c08059eb70f6f2363b3c45fc (commit)
  from  a93f28e4c0794fdfc1226d774a8ddce57aeef452 (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=1a54dc7196caedf938ef32655d13b05feb87e984
commit 1a54dc7196caedf938ef32655d13b05feb87e984
Merge: a93f28e 1e555a4
Author: Brad King 
AuthorDate: Fri Oct 21 09:00:02 2016 -0400
Commit: Brad King 
CommitDate: Fri Oct 21 09:00:02 2016 -0400

Merge branch 'master' into next


---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-287-ge094c8f

2016-10-21 Thread 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, master has been updated
   via  e094c8fa0aa3827b0e81660ad5e29d85b216d60f (commit)
   via  010560be6674def3ce02d05dcf2331230d0c4e91 (commit)
   via  2d3aa94225e259c9bc1c0d469e6326b476d225c1 (commit)
  from  97670dbf2fa567998c26686caa4f03b6f4e78967 (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=e094c8fa0aa3827b0e81660ad5e29d85b216d60f
commit e094c8fa0aa3827b0e81660ad5e29d85b216d60f
Merge: 97670db 010560b
Author: Brad King 
AuthorDate: Fri Oct 21 08:59:30 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 21 08:59:30 2016 -0400

Merge topic 'ninja-diagnose-missing-tool'

010560be Ninja: Fail early on when ninja build tool does not run
2d3aa942 cmGlobalGenerator: Allow FindMakeProgram to fail


---

Summary of changes:
 Source/cmGlobalGenerator.cxx   |   10 +++---
 Source/cmGlobalGenerator.h |2 +-
 Source/cmGlobalGhsMultiGenerator.cxx   |3 ++-
 Source/cmGlobalGhsMultiGenerator.h |2 +-
 Source/cmGlobalNinjaGenerator.cxx  |   20 
 Source/cmGlobalNinjaGenerator.h|2 +-
 Source/cmGlobalVisualStudio10Generator.cxx |7 +--
 Source/cmGlobalVisualStudio10Generator.h   |2 +-
 Source/cmGlobalVisualStudio7Generator.cxx  |7 +--
 Source/cmGlobalVisualStudio7Generator.h|2 +-
 Source/cmGlobalVisualStudioGenerator.cxx   |3 ++-
 Source/cmGlobalVisualStudioGenerator.h |2 +-
 Source/cmGlobalXCodeGenerator.cxx  |3 ++-
 Source/cmGlobalXCodeGenerator.h|2 +-
 .../NinjaToolMissing-result.txt}   |0
 Tests/RunCMake/Ninja/NinjaToolMissing-stderr.txt   |6 ++
 .../RunCMake/Ninja/NinjaToolMissing.cmake  |0
 Tests/RunCMake/Ninja/RunCMakeTest.cmake|6 ++
 18 files changed, 58 insertions(+), 21 deletions(-)
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => 
Ninja/NinjaToolMissing-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Ninja/NinjaToolMissing-stderr.txt
 copy Modules/IntelVSImplicitPath/hello.f => 
Tests/RunCMake/Ninja/NinjaToolMissing.cmake (100%)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-293-g1e555a4

2016-10-21 Thread 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, master has been updated
   via  1e555a44aa4e3d40bca2f88915c9f957098e5a55 (commit)
   via  ced77d2bbd07d195f563217bea1930e29472fd4d (commit)
  from  dd7f9d8393b4dfd470335e662bfb94aaf57f93e1 (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=1e555a44aa4e3d40bca2f88915c9f957098e5a55
commit 1e555a44aa4e3d40bca2f88915c9f957098e5a55
Merge: dd7f9d8 ced77d2
Author: Brad King 
AuthorDate: Fri Oct 21 08:59:42 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 21 08:59:42 2016 -0400

Merge topic 'ninja-encoding'

ced77d2b Ninja: Use ANSI encoding for Ninja build files on Windows


---

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx |   18 --
 Source/cmGlobalNinjaGenerator.h   |3 +++
 2 files changed, 19 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-291-gdd7f9d8

2016-10-21 Thread 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, master has been updated
   via  dd7f9d8393b4dfd470335e662bfb94aaf57f93e1 (commit)
   via  587ab3221300f04a4de0756dc1a44fa0eac9c0d2 (commit)
   via  149d49ea7c009f9965d9be91cdac8ee6cd2cfb91 (commit)
   via  60d73393a50944c1e81472d7e80a458bcb898554 (commit)
  from  e094c8fa0aa3827b0e81660ad5e29d85b216d60f (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=dd7f9d8393b4dfd470335e662bfb94aaf57f93e1
commit dd7f9d8393b4dfd470335e662bfb94aaf57f93e1
Merge: e094c8f 587ab32
Author: Brad King 
AuthorDate: Fri Oct 21 08:59:37 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 21 08:59:37 2016 -0400

Merge topic 'allow-fallback-config-mapping'

587ab322 Tests: Add test for MAP_IMPORTED_CONFIG_ empty fallback
149d49ea Teach MAP_IMPORTED_CONFIG_ to support configuration-less 
import
60d73393 Help: Format MAP_IMPORTED_CONFIG_ documentation


---

Summary of changes:
 Help/prop_tgt/MAP_IMPORTED_CONFIG_CONFIG.rst   |   22 +++
 Help/release/dev/allow-fallback-config-mapping.rst |6 +++
 Source/cmTarget.cxx|   41 +---
 Tests/GeneratorExpression/CMakeLists.txt   |8 
 Tests/GeneratorExpression/check-part3.cmake|2 +
 5 files changed, 57 insertions(+), 22 deletions(-)
 create mode 100644 Help/release/dev/allow-fallback-config-mapping.rst


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-284-g97670db

2016-10-21 Thread 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, master has been updated
   via  97670dbf2fa567998c26686caa4f03b6f4e78967 (commit)
   via  43f4326ece5035a5a028a7bb90a67c193804c997 (commit)
  from  ac394fddab4c4407c08059eb70f6f2363b3c45fc (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=97670dbf2fa567998c26686caa4f03b6f4e78967
commit 97670dbf2fa567998c26686caa4f03b6f4e78967
Merge: ac394fd 43f4326
Author: Brad King 
AuthorDate: Fri Oct 21 08:59:07 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 21 08:59:07 2016 -0400

Merge topic 'android-armeabi-c++_static'

43f4326e Android: Fix support for armeabi with c++_static


---

Summary of changes:
 Modules/Platform/Android/ndk-stl-c++_static.cmake |2 ++
 Tests/RunCMake/Android/RunCMakeTest.cmake |5 -
 2 files changed, 2 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-642-ga93f28e

2016-10-21 Thread 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  a93f28e4c0794fdfc1226d774a8ddce57aeef452 (commit)
   via  43f4326ece5035a5a028a7bb90a67c193804c997 (commit)
  from  9f2c6ee4d0a389aa89f94754f50a59674ab06e67 (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=a93f28e4c0794fdfc1226d774a8ddce57aeef452
commit a93f28e4c0794fdfc1226d774a8ddce57aeef452
Merge: 9f2c6ee 43f4326
Author: Brad King 
AuthorDate: Fri Oct 21 08:43:55 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 21 08:43:55 2016 -0400

Merge topic 'android-armeabi-c++_static' into next

43f4326e Android: Fix support for armeabi with c++_static


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43f4326ece5035a5a028a7bb90a67c193804c997
commit 43f4326ece5035a5a028a7bb90a67c193804c997
Author: Brad King 
AuthorDate: Fri Oct 21 08:23:38 2016 -0400
Commit: Brad King 
CommitDate: Fri Oct 21 08:42:25 2016 -0400

Android: Fix support for armeabi with c++_static

Add missing "unwind" and "atomic" libraries needed for this combination.
See `${ndk}/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++.a` for the
libraries the NDK uses.

Issue: #16380

diff --git a/Modules/Platform/Android/ndk-stl-c++_static.cmake 
b/Modules/Platform/Android/ndk-stl-c++_static.cmake
index 8e562f8..061a5c2 100644
--- a/Modules/Platform/Android/ndk-stl-c++_static.cmake
+++ b/Modules/Platform/Android/ndk-stl-c++_static.cmake
@@ -3,4 +3,6 @@ macro(__android_stl lang)
   __android_stl_cxx(${lang} libc++_static.a)
   __android_stl_lib(${lang} 
"${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${CMAKE_ANDROID_ARCH_ABI}/libc++abi.a"
 0)
   __android_stl_lib(${lang} 
"${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${CMAKE_ANDROID_ARCH_ABI}/libandroid_support.a"
 0)
+  __android_stl_lib(${lang} 
"${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${CMAKE_ANDROID_ARCH_ABI}/libunwind.a"
 0)
+  string(APPEND CMAKE_${lang}_STANDARD_LIBRARIES " -latomic") # provided by 
toolchain
 endmacro()
diff --git a/Tests/RunCMake/Android/RunCMakeTest.cmake 
b/Tests/RunCMake/Android/RunCMakeTest.cmake
index 39b77cd..86a9896 100644
--- a/Tests/RunCMake/Android/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Android/RunCMakeTest.cmake
@@ -174,11 +174,6 @@ foreach(ndk IN LISTS TEST_ANDROID_NDK)
 continue()
   endif()
 
-  # Skip combinations that seem to be broken.
-  if("${stl};${abi}" MATCHES [[^c\+\+_static;armeabi]])
-continue()
-  endif()
-
   # Run the tests for this combination.
   if("${abi}" STREQUAL "armeabi")
 run_Android(ndk-armeabi-thumb) # default: 
-DCMAKE_ANDROID_ARCH_ABI=armeabi -DCMAKE_ANDROID_ARM_MODE=0

---

Summary of changes:
 Modules/Platform/Android/ndk-stl-c++_static.cmake |2 ++
 Tests/RunCMake/Android/RunCMakeTest.cmake |5 -
 2 files changed, 2 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits