[Cmake-commits] CMake branch, master, updated. v3.6.2-1183-g2078686

[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  20786869e8b60b1917aa2f7681971e6ecd1f6393 (commit)
  from  1a5fddfe6d56733528ace3d15899b0739ea28054 (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=20786869e8b60b1917aa2f7681971e6ecd1f6393
commit 20786869e8b60b1917aa2f7681971e6ecd1f6393
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Tue Sep 27 00:01:05 2016 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Sep 27 00:01:05 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 9a10ddb..9eb99ea 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 6)
-set(CMake_VERSION_PATCH 20160926)
+set(CMake_VERSION_PATCH 20160927)
 #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.6.2-2522-gcdaf32e

[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  cdaf32edb833a9cdfd71b99e2a013206c2a5bc42 (commit)
   via  c1d108a9f207225c7b1342a60cd88fd325fa7ced (commit)
  from  ed5809dd7da5b11f65ecb3996adc37d9cfecf145 (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=cdaf32edb833a9cdfd71b99e2a013206c2a5bc42
commit cdaf32edb833a9cdfd71b99e2a013206c2a5bc42
Merge: ed5809d c1d108a
Author: Brad King 
AuthorDate: Mon Sep 26 17:24:48 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 17:24:48 2016 -0400

Merge topic 'copyright-by-contributors' into next

c1d108a9 Revert "Copyright.txt: Add notice of copyright by contributors"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1d108a9f207225c7b1342a60cd88fd325fa7ced
commit c1d108a9f207225c7b1342a60cd88fd325fa7ced
Author: Brad King 
AuthorDate: Mon Sep 26 17:24:12 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 26 17:24:12 2016 -0400

Revert "Copyright.txt: Add notice of copyright by contributors"

This reverts commit 16fddd040338061d5ed3b652fdbb1f6fc3d99240.
It will be revised and restored.

diff --git a/Copyright.txt b/Copyright.txt
index 7b06205..f8f 100644
--- a/Copyright.txt
+++ b/Copyright.txt
@@ -1,5 +1,5 @@
 CMake - Cross Platform Makefile Generator
-Copyright 2000-2016 Kitware, Inc. and Contributors
+Copyright 2000-2016 Kitware, Inc.
 Copyright 2000-2011 Insight Software Consortium
 All rights reserved.
 
@@ -15,7 +15,7 @@ are met:
   documentation and/or other materials provided with the distribution.
 
 * Neither the names of Kitware, Inc., the Insight Software Consortium,
-  nor the names of their Contributors may be used to endorse or promote
+  nor the names of their contributors may be used to endorse or promote
   products derived from this software without specific prior written
   permission.
 
@@ -35,7 +35,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
DAMAGE.
 
 The above copyright and license notice applies to distributions of
 CMake in source and binary form.  Some source files contain additional
-notices of original copyright by their Contributors; see each source
+notices of original copyright by their contributors; see each source
 for details.  Third-party software packages supplied with CMake under
 compatible licenses provide their own copyright notices documented in
 corresponding subdirectories.

---

Summary of changes:
 Copyright.txt |6 +++---
 1 file changed, 3 insertions(+), 3 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.6.2-2520-ged5809d

[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  ed5809dd7da5b11f65ecb3996adc37d9cfecf145 (commit)
   via  cda8c782db80a1352ec6737b783558e35238bf17 (commit)
  from  e924a8ef1d469760c614617cb16ed9801dcbd941 (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=ed5809dd7da5b11f65ecb3996adc37d9cfecf145
commit ed5809dd7da5b11f65ecb3996adc37d9cfecf145
Merge: e924a8e cda8c78
Author: Brad King 
AuthorDate: Mon Sep 26 15:36:21 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 15:36:21 2016 -0400

Merge topic 'index-directories' into next

cda8c782 cmGlobalGenerator: Optimize FindMakefile method with an index


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cda8c782db80a1352ec6737b783558e35238bf17
commit cda8c782db80a1352ec6737b783558e35238bf17
Author: Brad King 
AuthorDate: Mon Sep 26 15:29:53 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 26 15:35:39 2016 -0400

cmGlobalGenerator: Optimize FindMakefile method with an index

This method is used by directory get/set APIs.  With the new
`SUBDIRECTORIES` and `BUILDSYSTEM_TARGETS` methods projects may now make
heavy use of these APIs to traverse their directory structure and
process targets.  Make this faster by indexing the directory lookups.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 95747f2..4c62be7 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1059,6 +1059,7 @@ void cmGlobalGenerator::Configure()
 
   cmMakefile* dirMf = new cmMakefile(this, snapshot);
   this->Makefiles.push_back(dirMf);
+  this->IndexMakefile(dirMf);
 
   this->BinaryDirectories.insert(
 this->CMakeInstance->GetHomeOutputDirectory());
@@ -1528,6 +1529,7 @@ void cmGlobalGenerator::ClearGeneratorMembers()
   this->TargetDependencies.clear();
   this->TargetSearchIndex.clear();
   this->GeneratorTargetSearchIndex.clear();
+  this->MakefileSearchIndex.clear();
   this->ProjectMap.clear();
   this->RuleHashes.clear();
   this->DirectoryContentMap.clear();
@@ -1805,6 +1807,7 @@ std::string cmGlobalGenerator::GenerateCMakeBuildCommand(
 void cmGlobalGenerator::AddMakefile(cmMakefile* mf)
 {
   this->Makefiles.push_back(mf);
+  this->IndexMakefile(mf);
 
   // update progress
   // estimate how many lg there will be
@@ -1962,12 +1965,9 @@ void cmGlobalGenerator::FillProjectMap()
 
 cmMakefile* cmGlobalGenerator::FindMakefile(const std::string& start_dir) const
 {
-  for (std::vector::const_iterator it = this->Makefiles.begin();
-   it != this->Makefiles.end(); ++it) {
-std::string sd = (*it)->GetCurrentSourceDirectory();
-if (sd == start_dir) {
-  return *it;
-}
+  MakefileMap::const_iterator i = this->MakefileSearchIndex.find(start_dir);
+  if (i != this->MakefileSearchIndex.end()) {
+return i->second;
   }
   return CM_NULLPTR;
 }
@@ -2012,6 +2012,17 @@ void 
cmGlobalGenerator::IndexGeneratorTarget(cmGeneratorTarget* gt)
   }
 }
 
+void cmGlobalGenerator::IndexMakefile(cmMakefile* mf)
+{
+  // FIXME: add_subdirectory supports multiple build directories
+  // sharing the same source directory.  We currently index only the
+  // first one, because that is what FindMakefile has always returned.
+  // All of its callers will need to be modified to support looking
+  // up directories by build directory path.
+  this->MakefileSearchIndex.insert(
+MakefileMap::value_type(mf->GetCurrentSourceDirectory(), mf));
+}
+
 cmTarget* cmGlobalGenerator::FindTargetImpl(std::string const& name) const
 {
   TargetMap::const_iterator i = this->TargetSearchIndex.find(name);
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 7bc389d..8f1d70c 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -462,13 +462,16 @@ private:
   typedef std::unordered_map TargetMap;
   typedef std::unordered_map
 GeneratorTargetMap;
+  typedef std::unordered_map MakefileMap;
 #else
   typedef cmsys::hash_map TargetMap;
   typedef cmsys::hash_map GeneratorTargetMap;
+  typedef cmsys::hash_map MakefileMap;
 #endif
 #else
   typedef std::map TargetMap;
   typedef std::map GeneratorTargetMap;
+  typedef std::map MakefileMap;
 #endif
   // Map efficiently from target name to 

[Cmake-commits] CMake branch, next, updated. v3.6.2-2518-ge924a8e

[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  e924a8ef1d469760c614617cb16ed9801dcbd941 (commit)
   via  89c20300ed55e06459325a981eb1ae0f6bb8378a (commit)
   via  965eb50cda15a2b991684fce2d9e64556ca38523 (commit)
  from  f73fc9bc9e5e0d13da64695e4b2209e00632f874 (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=e924a8ef1d469760c614617cb16ed9801dcbd941
commit e924a8ef1d469760c614617cb16ed9801dcbd941
Merge: f73fc9b 89c2030
Author: Brad King 
AuthorDate: Mon Sep 26 14:51:38 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 14:51:38 2016 -0400

Merge topic 'suppress-pgi-warnings' into next

89c20300 CTestCustom: Suppress PGI warnings in generated Lexer/Parser code
965eb50c CTestCustom: Suppress PGI compiler warning summary line


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89c20300ed55e06459325a981eb1ae0f6bb8378a
commit 89c20300ed55e06459325a981eb1ae0f6bb8378a
Author: Brad King 
AuthorDate: Mon Sep 26 14:50:02 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 26 14:50:02 2016 -0400

CTestCustom: Suppress PGI warnings in generated Lexer/Parser code

diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index 93efdb4..710681c 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -49,6 +49,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
   "stl_deque.h:1051"
   "(Lexer|Parser).*warning.*conversion.*may (alter its value|change the sign)"
   "(Lexer|Parser).*warning.*(statement is unreachable|will never be executed)"
+  "(Lexer|Parser).*warning.*variable.*was set but never used"
   "PGC-W-0095-Type cast required for this conversion.*ProcessUNIX.c"
   "[Qq]t([Cc]ore|[Gg]ui|[Ww]idgets).*warning.*conversion.*may alter its value"
   "warning:.*is.*very unsafe.*consider using.*"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=965eb50cda15a2b991684fce2d9e64556ca38523
commit 965eb50cda15a2b991684fce2d9e64556ca38523
Author: Brad King 
AuthorDate: Mon Sep 26 14:49:08 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 26 14:49:39 2016 -0400

CTestCustom: Suppress PGI compiler warning summary line

We will match/ignore the actual warning lines, if any, so we can always
ignore the summary line if present.

diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index 8489178..93efdb4 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -70,6 +70,8 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
   # Ignore clang's summary warning, assuming prior text has matched some
   # other warning expression:
   "[0-9,]+ warnings? generated."
+  # similarly for PGI
+  "compilation completed with warnings"
 
 # scanbuild exceptions
   "char_traits.h:.*: warning: Null pointer argument in call to string length 
function"

---

Summary of changes:
 CTestCustom.cmake.in |3 +++
 1 file changed, 3 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.6.2-2515-gf73fc9b

[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  f73fc9bc9e5e0d13da64695e4b2209e00632f874 (commit)
   via  890432672bc9fe91365e5e5305285ab193e9060a (commit)
   via  0a8ad6700eb7f54961271b3ee7b41add61eb0be5 (commit)
   via  544f65f44de0bb63a0b427150eb5e2bc90f58396 (commit)
   via  82104cc7a8e831ad20cb87d126c2ff00a851bedc (commit)
  from  022bd40319d609099d836bd40fd67ce58f3ce7b2 (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=f73fc9bc9e5e0d13da64695e4b2209e00632f874
commit f73fc9bc9e5e0d13da64695e4b2209e00632f874
Merge: 022bd40 8904326
Author: Brad King 
AuthorDate: Mon Sep 26 14:34:50 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 14:34:50 2016 -0400

Merge topic 'cmake-server-basic-commands' into next

89043267 server-mode: Add command to compute the build system
0a8ad670 server-mode: Add a configure command
544f65f4 server-mode: Set global configuration of cmake via a command
82104cc7 server-mode: Query global configuration of cmake via a command


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=890432672bc9fe91365e5e5305285ab193e9060a
commit 890432672bc9fe91365e5e5305285ab193e9060a
Author: Tobias Hunger 
AuthorDate: Fri Sep 9 10:01:45 2016 +0200
Commit: Brad King 
CommitDate: Mon Sep 26 14:33:12 2016 -0400

server-mode: Add command to compute the build system

diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst
index c5d4968..b8a425c 100644
--- a/Help/manual/cmake-server.7.rst
+++ b/Help/manual/cmake-server.7.rst
@@ -355,3 +355,22 @@ CMake will reply like this (after reporting progress for 
some time)::
   [== CMake Server ==[
   {"cookie":"","inReplyTo":"configure","type":"reply"}
   ]== CMake Server ==]
+
+
+Type "compute"
+^^
+
+This requist will generate build system files in the build directory and
+is only available after a project was successfully "configure"d.
+
+Example::
+
+  [== CMake Server ==[
+  {"type":"compute"}
+  ]== CMake Server ==]
+
+CMake will reply (after reporting progress information)::
+
+  [== CMake Server ==[
+  {"cookie":"","inReplyTo":"compute","type":"reply"}
+  ]== CMake Server ==]
diff --git a/Source/cmServerDictionary.h b/Source/cmServerDictionary.h
index b78a1f4..fc1b44d 100644
--- a/Source/cmServerDictionary.h
+++ b/Source/cmServerDictionary.h
@@ -16,6 +16,7 @@
 
 // Vocabulary:
 
+static const std::string kCOMPUTE_TYPE = "compute";
 static const std::string kCONFIGURE_TYPE = "configure";
 static const std::string kERROR_TYPE = "error";
 static const std::string kGLOBAL_SETTINGS_TYPE = "globalSettings";
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index 06f5177..134edf3 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -280,6 +280,9 @@ const cmServerResponse cmServerProtocol1_0::Process(
 {
   assert(this->m_State >= STATE_ACTIVE);
 
+  if (request.Type == kCOMPUTE_TYPE) {
+return this->ProcessCompute(request);
+  }
   if (request.Type == kCONFIGURE_TYPE) {
 return this->ProcessConfigure(request);
   }
@@ -298,6 +301,26 @@ bool cmServerProtocol1_0::IsExperimental() const
   return true;
 }
 
+cmServerResponse cmServerProtocol1_0::ProcessCompute(
+  const cmServerRequest& request)
+{
+  if (this->m_State > STATE_CONFIGURED) {
+return request.ReportError("This build system was already generated.");
+  }
+  if (this->m_State < STATE_CONFIGURED) {
+return request.ReportError("This project was not configured yet.");
+  }
+
+  cmake* cm = this->CMakeInstance();
+  int ret = cm->Generate();
+
+  if (ret < 0) {
+return request.ReportError("Failed to compute build system.");
+  }
+  m_State = STATE_COMPUTED;
+  return request.Reply(Json::Value());
+}
+
 cmServerResponse cmServerProtocol1_0::ProcessConfigure(
   const cmServerRequest& request)
 {
diff --git a/Source/cmServerProtocol.h b/Source/cmServerProtocol.h
index c0148a4..e772eca 100644
--- a/Source/cmServerProtocol.h
+++ b/Source/cmServerProtocol.h
@@ -118,6 +118,7 @@ private:
   std::string* errorMessage) override;
 
   // Handle requests:
+  cmServerResponse ProcessCompute(const cmServerRequest& request);
   cmServerResponse ProcessConfigure(const cmServerRequest& request);
   cmServerResponse ProcessGlobalSettings(const cmServerRequest& request);
   cmServerResponse ProcessSetGlobalSettings(const cmServerRequest& request);
@@ -126,7 +127,8 @@ private:
   {
 STATE_INACTIVE,
 STATE_ACTIVE,
-STATE_CONFIGURED
+

[Cmake-commits] CMake branch, next, updated. v3.6.2-2510-g022bd40

[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  022bd40319d609099d836bd40fd67ce58f3ce7b2 (commit)
   via  56e7dc9d98c964ca7ce87c2484597e12982af2a2 (commit)
  from  8b91d5f6730301176bcef83f689267ec433887ef (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=022bd40319d609099d836bd40fd67ce58f3ce7b2
commit 022bd40319d609099d836bd40fd67ce58f3ce7b2
Merge: 8b91d5f 56e7dc9
Author: Brad King 
AuthorDate: Mon Sep 26 14:34:22 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 14:34:22 2016 -0400

Merge topic 'cmake-server-basic-commands' into next

56e7dc9d Revise style in topic 'cmake-server-basic-commands'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56e7dc9d98c964ca7ce87c2484597e12982af2a2
commit 56e7dc9d98c964ca7ce87c2484597e12982af2a2
Author: Brad King 
AuthorDate: Mon Sep 26 14:34:03 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 26 14:34:03 2016 -0400

Revise style in topic 'cmake-server-basic-commands'

diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index cf886be..134edf3 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -280,14 +280,18 @@ const cmServerResponse cmServerProtocol1_0::Process(
 {
   assert(this->m_State >= STATE_ACTIVE);
 
-  if (request.Type == kCOMPUTE_TYPE)
+  if (request.Type == kCOMPUTE_TYPE) {
 return this->ProcessCompute(request);
-  if (request.Type == kCONFIGURE_TYPE)
+  }
+  if (request.Type == kCONFIGURE_TYPE) {
 return this->ProcessConfigure(request);
-  if (request.Type == kGLOBAL_SETTINGS_TYPE)
+  }
+  if (request.Type == kGLOBAL_SETTINGS_TYPE) {
 return this->ProcessGlobalSettings(request);
-  if (request.Type == kSET_GLOBAL_SETTINGS_TYPE)
+  }
+  if (request.Type == kSET_GLOBAL_SETTINGS_TYPE) {
 return this->ProcessSetGlobalSettings(request);
+  }
 
   return request.ReportError("Unknown command!");
 }
@@ -312,10 +316,9 @@ cmServerResponse cmServerProtocol1_0::ProcessCompute(
 
   if (ret < 0) {
 return request.ReportError("Failed to compute build system.");
-  } else {
-m_State = STATE_COMPUTED;
-return request.Reply(Json::Value());
   }
+  m_State = STATE_COMPUTED;
+  return request.Reply(Json::Value());
 }
 
 cmServerResponse cmServerProtocol1_0::ProcessConfigure(
@@ -399,10 +402,9 @@ cmServerResponse cmServerProtocol1_0::ProcessConfigure(
   int ret = cm->Configure();
   if (ret < 0) {
 return request.ReportError("Configuration failed.");
-  } else {
-m_State = STATE_CONFIGURED;
-return request.Reply(Json::Value());
   }
+  m_State = STATE_CONFIGURED;
+  return request.Reply(Json::Value());
 }
 
 cmServerResponse cmServerProtocol1_0::ProcessGlobalSettings(
@@ -437,8 +439,9 @@ cmServerResponse cmServerProtocol1_0::ProcessGlobalSettings(
 static void setBool(const cmServerRequest& request, const std::string& key,
 std::function setter)
 {
-  if (request.Data[key].isNull())
+  if (request.Data[key].isNull()) {
 return;
+  }
   setter(request.Data[key].asBool());
 }
 

---

Summary of changes:
 Source/cmServerProtocol.cxx |   25 ++---
 1 file changed, 14 insertions(+), 11 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.6.2-2508-g8b91d5f

[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  8b91d5f6730301176bcef83f689267ec433887ef (commit)
   via  8d1e65638c349d7a8ed59aca8bd8bd260c1eda72 (commit)
   via  c58cd7e03fca3d1e2ea9e3884afc5aabf2935dee (commit)
   via  4649607c3cce63e4479a67765645f11b0d345b9a (commit)
   via  db7f1f0474b06143d7987840cfb33aa445097da6 (commit)
  from  4994d675cfc9cc52c180dcf7b7fb1b0c8ec9bf40 (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=8b91d5f6730301176bcef83f689267ec433887ef
commit 8b91d5f6730301176bcef83f689267ec433887ef
Merge: 4994d67 8d1e656
Author: Brad King 
AuthorDate: Mon Sep 26 14:30:08 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 14:30:08 2016 -0400

Merge topic 'cmake-server-basic-commands' into next

8d1e6563 server-mode: Add command to compute the build system
c58cd7e0 server-mode: Add a configure command
4649607c server-mode: Set global configuration of cmake via a command
db7f1f04 server-mode: Query global configuration of cmake via a command


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d1e65638c349d7a8ed59aca8bd8bd260c1eda72
commit 8d1e65638c349d7a8ed59aca8bd8bd260c1eda72
Author: Tobias Hunger 
AuthorDate: Fri Sep 9 10:01:45 2016 +0200
Commit: Brad King 
CommitDate: Mon Sep 26 14:29:43 2016 -0400

server-mode: Add command to compute the build system

diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst
index c5d4968..b8a425c 100644
--- a/Help/manual/cmake-server.7.rst
+++ b/Help/manual/cmake-server.7.rst
@@ -355,3 +355,22 @@ CMake will reply like this (after reporting progress for 
some time)::
   [== CMake Server ==[
   {"cookie":"","inReplyTo":"configure","type":"reply"}
   ]== CMake Server ==]
+
+
+Type "compute"
+^^
+
+This requist will generate build system files in the build directory and
+is only available after a project was successfully "configure"d.
+
+Example::
+
+  [== CMake Server ==[
+  {"type":"compute"}
+  ]== CMake Server ==]
+
+CMake will reply (after reporting progress information)::
+
+  [== CMake Server ==[
+  {"cookie":"","inReplyTo":"compute","type":"reply"}
+  ]== CMake Server ==]
diff --git a/Source/cmServerDictionary.h b/Source/cmServerDictionary.h
index b78a1f4..fc1b44d 100644
--- a/Source/cmServerDictionary.h
+++ b/Source/cmServerDictionary.h
@@ -16,6 +16,7 @@
 
 // Vocabulary:
 
+static const std::string kCOMPUTE_TYPE = "compute";
 static const std::string kCONFIGURE_TYPE = "configure";
 static const std::string kERROR_TYPE = "error";
 static const std::string kGLOBAL_SETTINGS_TYPE = "globalSettings";
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index 9410387..cf886be 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -280,6 +280,8 @@ const cmServerResponse cmServerProtocol1_0::Process(
 {
   assert(this->m_State >= STATE_ACTIVE);
 
+  if (request.Type == kCOMPUTE_TYPE)
+return this->ProcessCompute(request);
   if (request.Type == kCONFIGURE_TYPE)
 return this->ProcessConfigure(request);
   if (request.Type == kGLOBAL_SETTINGS_TYPE)
@@ -295,6 +297,27 @@ bool cmServerProtocol1_0::IsExperimental() const
   return true;
 }
 
+cmServerResponse cmServerProtocol1_0::ProcessCompute(
+  const cmServerRequest& request)
+{
+  if (this->m_State > STATE_CONFIGURED) {
+return request.ReportError("This build system was already generated.");
+  }
+  if (this->m_State < STATE_CONFIGURED) {
+return request.ReportError("This project was not configured yet.");
+  }
+
+  cmake* cm = this->CMakeInstance();
+  int ret = cm->Generate();
+
+  if (ret < 0) {
+return request.ReportError("Failed to compute build system.");
+  } else {
+m_State = STATE_COMPUTED;
+return request.Reply(Json::Value());
+  }
+}
+
 cmServerResponse cmServerProtocol1_0::ProcessConfigure(
   const cmServerRequest& request)
 {
diff --git a/Source/cmServerProtocol.h b/Source/cmServerProtocol.h
index c0148a4..e772eca 100644
--- a/Source/cmServerProtocol.h
+++ b/Source/cmServerProtocol.h
@@ -118,6 +118,7 @@ private:
   std::string* errorMessage) override;
 
   // Handle requests:
+  cmServerResponse ProcessCompute(const cmServerRequest& request);
   cmServerResponse ProcessConfigure(const cmServerRequest& request);
   cmServerResponse ProcessGlobalSettings(const cmServerRequest& request);
   cmServerResponse ProcessSetGlobalSettings(const cmServerRequest& request);
@@ -126,7 +127,8 @@ private:
   {
 STATE_INACTIVE,
 

[Cmake-commits] CMake branch, next, updated. v3.6.2-2503-g4994d67

[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  4994d675cfc9cc52c180dcf7b7fb1b0c8ec9bf40 (commit)
   via  33ec71f343f8b508b16437cc282607d77b996df1 (commit)
  from  930dec1e95061983dac19004e0bf5740339fe46b (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=4994d675cfc9cc52c180dcf7b7fb1b0c8ec9bf40
commit 4994d675cfc9cc52c180dcf7b7fb1b0c8ec9bf40
Merge: 930dec1 33ec71f
Author: Brad King 
AuthorDate: Mon Sep 26 14:12:59 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 14:12:59 2016 -0400

Merge topic 'find-matlab-pthread' into next

33ec71f3 FindMatlab: Fix -pthread check for projects with only C enabled


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33ec71f343f8b508b16437cc282607d77b996df1
commit 33ec71f343f8b508b16437cc282607d77b996df1
Author: Jamie Snape 
AuthorDate: Mon Sep 26 13:59:37 2016 -0400
Commit: Jamie Snape 
CommitDate: Mon Sep 26 13:59:37 2016 -0400

FindMatlab: Fix -pthread check for projects with only C enabled

diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 8b41bb9..d016848 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -225,6 +225,7 @@ set(_FindMatlab_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}")
 
 include(FindPackageHandleStandardArgs)
 include(CheckCXXCompilerFlag)
+include(CheckCCompilerFlag)
 
 
 # The currently supported versions. Other version can be added by the user by
@@ -871,7 +872,11 @@ function(matlab_add_mex)
   if(NOT WIN32)
 # we do not need all this on Windows
 # pthread options
-check_cxx_compiler_flag(-pthreadHAS_MINUS_PTHREAD)
+if(CMAKE_CXX_COMPILER_LOADED)
+  check_cxx_compiler_flag(-pthread HAS_MINUS_PTHREAD)
+elseif(CMAKE_C_COMPILER_LOADED)
+  check_c_compiler_flag(-pthread HAS_MINUS_PTHREAD)
+endif()
 # we should use try_compile instead, the link flags are discarded from
 # this compiler_flag function.
 #check_cxx_compiler_flag(-Wl,--exclude-libs,ALL 
HAS_SYMBOL_HIDING_CAPABILITY)

---

Summary of changes:
 Modules/FindMatlab.cmake |7 ++-
 1 file changed, 6 insertions(+), 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.6.2-2501-g930dec1

[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  930dec1e95061983dac19004e0bf5740339fe46b (commit)
   via  cbe488792746377396a9f38aeb2999750ade518a (commit)
  from  5729779fb802ef3dc8fb00ada2d284edd580c022 (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=930dec1e95061983dac19004e0bf5740339fe46b
commit 930dec1e95061983dac19004e0bf5740339fe46b
Merge: 5729779 cbe4887
Author: Brad King 
AuthorDate: Mon Sep 26 13:41:56 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 13:41:56 2016 -0400

Merge topic 'codelite-organize-by-target' into next

cbe48879 CodeLite: Optionally use targets to create (sub)project files


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbe488792746377396a9f38aeb2999750ade518a
commit cbe488792746377396a9f38aeb2999750ade518a
Author: Minze Zwerver 
AuthorDate: Fri Sep 23 08:42:20 2016 +0200
Commit: Brad King 
CommitDate: Mon Sep 26 13:40:38 2016 -0400

CodeLite: Optionally use targets to create (sub)project files

The basic codelite generator creates .project files based on the
`project()` stanza.  Add a `CMAKE_CODELITE_USE_TARGETS` option to use
the targets instead.

diff --git a/Help/generator/CodeLite.rst b/Help/generator/CodeLite.rst
index dbc46d7..3e60aa6 100644
--- a/Help/generator/CodeLite.rst
+++ b/Help/generator/CodeLite.rst
@@ -5,7 +5,11 @@ Generates CodeLite project files.
 
 Project files for CodeLite will be created in the top directory and
 in every subdirectory which features a CMakeLists.txt file containing
-a PROJECT() call. The appropriate make program can build the
+a :command:`project` call.
+The :variable:`CMAKE_CODELITE_USE_TARGETS` variable may be set to ``ON``
+to change the default behaviour from projects to targets as the basis
+for project files.
+The appropriate make program can build the
 project through the default make target.  A "make install" target is
 also provided.
 
diff --git a/Help/manual/cmake-variables.7.rst 
b/Help/manual/cmake-variables.7.rst
index 9e0efe9..2d2a0b6 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -112,6 +112,7 @@ Variables that Change Behavior
/variable/CMAKE_AUTOMOC_RELAXED_MODE
/variable/CMAKE_BACKWARDS_COMPATIBILITY
/variable/CMAKE_BUILD_TYPE
+   /variable/CMAKE_CODELITE_USE_TARGETS
/variable/CMAKE_COLOR_MAKEFILE
/variable/CMAKE_CONFIGURATION_TYPES
/variable/CMAKE_DEBUG_TARGET_PROPERTIES
diff --git a/Help/release/dev/codelite-organize-by-target.rst 
b/Help/release/dev/codelite-organize-by-target.rst
new file mode 100644
index 000..0979228
--- /dev/null
+++ b/Help/release/dev/codelite-organize-by-target.rst
@@ -0,0 +1,6 @@
+codelite-organize-by-target
+---
+
+* The :generator:`CodeLite` generator gained a new
+  :variable:`CMAKE_CODELITE_USE_TARGETS` option
+  to change project creation from projects to targets.
diff --git a/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst 
b/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst
new file mode 100644
index 000..4aede03
--- /dev/null
+++ b/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst
@@ -0,0 +1,7 @@
+CMAKE_CODELITE_USE_TARGETS
+--
+
+Change the way the CodeLite generator creates projectfiles.
+
+If this variable is set to ``ON`` the generator creates projectfiles
+based on targets rather than projects.
diff --git a/Source/cmExtraCodeLiteGenerator.cxx 
b/Source/cmExtraCodeLiteGenerator.cxx
index a039f49..07a 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -70,6 +70,8 @@ void cmExtraCodeLiteGenerator::Generate()
 
   // loop projects and locate the root project.
   // and extract the information for creating the worspace
+  // root makefile
+  const cmMakefile* rmf = CM_NULLPTR;
   for (std::map >::const_iterator
  it = projectMap.begin();
it != projectMap.end(); ++it) {
@@ -84,6 +86,7 @@ void cmExtraCodeLiteGenerator::Generate()
   workspaceFileName = workspaceOutputDir + "/";
   workspaceFileName += workspaceProjectName + ".workspace";
   this->WorkspacePath = it->second[0]->GetCurrentBinaryDirectory();
+  rmf = it->second[0]->GetMakefile();
   ;
   break;
 }
@@ -96,26 +99,14 @@ void cmExtraCodeLiteGenerator::Generate()
   xml.StartElement("CodeLite_Workspace");
   xml.Attribute("Name", workspaceProjectName);
 
-  // for each sub project in the workspace create a codelite project
-  for 

[Cmake-commits] CMake branch, next, updated. v3.6.2-2499-g5729779

[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  5729779fb802ef3dc8fb00ada2d284edd580c022 (commit)
   via  1a5fddfe6d56733528ace3d15899b0739ea28054 (commit)
  from  519b3173245cc53bd33b22e0b6bfe3780faf9160 (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=5729779fb802ef3dc8fb00ada2d284edd580c022
commit 5729779fb802ef3dc8fb00ada2d284edd580c022
Merge: 519b317 1a5fddf
Author: Brad King 
AuthorDate: Mon Sep 26 13:20:23 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 26 13:20:23 2016 -0400

Merge branch 'master' into next


---

Summary of changes:


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.6.2-1182-g1a5fddf

[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  1a5fddfe6d56733528ace3d15899b0739ea28054 (commit)
   via  540815eec2b83a8b43689580c54e8950d9f5868b (commit)
  from  a721830767c6a7819ed82cda5f910b732201f885 (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=1a5fddfe6d56733528ace3d15899b0739ea28054
commit 1a5fddfe6d56733528ace3d15899b0739ea28054
Merge: a721830 540815e
Author: Brad King 
AuthorDate: Mon Sep 26 13:20:14 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 13:20:14 2016 -0400

Merge topic 'xcode-sdk-version'

540815ee Xcode: Convert maybe unversioned OSX sysroot into versioned SDK 
path


---

Summary of changes:
 Modules/Platform/Darwin-Initialize.cmake |6 --
 1 file changed, 4 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, next, updated. v3.6.2-2497-g519b317

[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  519b3173245cc53bd33b22e0b6bfe3780faf9160 (commit)
   via  7bfd5b7fa568862ec4b31539b1ba705f1c9f6bd0 (commit)
  from  5e2813bc7a5fc95e09da993384bad8801df476ee (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=519b3173245cc53bd33b22e0b6bfe3780faf9160
commit 519b3173245cc53bd33b22e0b6bfe3780faf9160
Merge: 5e2813b 7bfd5b7
Author: Brad King 
AuthorDate: Mon Sep 26 13:19:24 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 13:19:24 2016 -0400

Merge topic 'ninja-include-dir' into next

7bfd5b7f Ninja: Add source location as include directory for preprocessed 
files


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bfd5b7fa568862ec4b31539b1ba705f1c9f6bd0
commit 7bfd5b7fa568862ec4b31539b1ba705f1c9f6bd0
Author: Nils Gladitz 
AuthorDate: Fri Sep 23 22:59:37 2016 +0200
Commit: Nils Gladitz 
CommitDate: Mon Sep 26 17:57:11 2016 +0200

Ninja: Add source location as include directory for preprocessed files

Fortran INCLUDE statements are not handled by the preprocessor.

Since the location of the preprocessed file is distinct from the
original source file explicitly add the source file's directory
as an include path in the actual compile step (not the preprocessing step)
so INCLUDE can find it.

diff --git a/Source/cmNinjaTargetGenerator.cxx 
b/Source/cmNinjaTargetGenerator.cxx
index b418ce3..f88eb7b 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -841,6 +841,18 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
 // directive.
 ppVars["INCLUDES"] = vars["INCLUDES"];
 
+// Prepend source file's original directory as an include directory
+// so e.g. Fortran INCLUDE statements can look for files in it.
+std::vector sourceDirectory;
+sourceDirectory.push_back(
+  cmSystemTools::GetParentDirectory(source->GetFullPath()));
+
+std::string sourceDirectoryFlag = this->LocalGenerator->GetIncludeFlags(
+  sourceDirectory, this->GeneratorTarget, language, false, false,
+  this->GetConfigName());
+
+vars["INCLUDES"] = sourceDirectoryFlag + " " + vars["INCLUDES"];
+
 // Explicit preprocessing always uses a depfile.
 ppVars["DEP_FILE"] =
   cmGlobalNinjaGenerator::EncodeDepfileSpace(ppFileName + ".d");
diff --git a/Tests/FortranModules/CMakeLists.txt 
b/Tests/FortranModules/CMakeLists.txt
index ff12771..3996600 100644
--- a/Tests/FortranModules/CMakeLists.txt
+++ b/Tests/FortranModules/CMakeLists.txt
@@ -52,6 +52,8 @@ add_definitions(-DFOO -DBAR=1)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 add_executable(test_preprocess test_preprocess.F90 test_preprocess_module.F90)
 
+add_executable(test_non_pp_include test_non_pp_include_main.f90)
+
 # Build the external project separately using a custom target.
 # Make sure it uses the same build configuration as this test.
 if(CMAKE_CONFIGURATION_TYPES)
diff --git a/Tests/FortranModules/non_pp_include.f90 
b/Tests/FortranModules/non_pp_include.f90
new file mode 100644
index 000..7eb1725
--- /dev/null
+++ b/Tests/FortranModules/non_pp_include.f90
@@ -0,0 +1,3 @@
+SUBROUTINE NON_PP_INCLUDE_SUBROUTINE
+   PRINT *, "Hello World!"
+END SUBROUTINE NON_PP_INCLUDE_SUBROUTINE
diff --git a/Tests/FortranModules/test_non_pp_include_main.f90 
b/Tests/FortranModules/test_non_pp_include_main.f90
new file mode 100644
index 000..8a04fbd
--- /dev/null
+++ b/Tests/FortranModules/test_non_pp_include_main.f90
@@ -0,0 +1,5 @@
+INCLUDE "non_pp_include.f90"
+
+PROGRAM MAINF90
+   CALL NON_PP_INCLUDE_SUBROUTINE
+END PROGRAM MAINF90

---

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx |   12 
 Tests/FortranModules/CMakeLists.txt   |2 ++
 Tests/FortranModules/non_pp_include.f90   |3 +++
 Tests/FortranModules/test_non_pp_include_main.f90 |5 +
 4 files changed, 22 insertions(+)
 create mode 100644 Tests/FortranModules/non_pp_include.f90
 create mode 100644 Tests/FortranModules/test_non_pp_include_main.f90


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.6.2-2495-g5e2813b

[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  5e2813bc7a5fc95e09da993384bad8801df476ee (commit)
   via  16fddd040338061d5ed3b652fdbb1f6fc3d99240 (commit)
  from  6330c8f70b69e8aac2d05846ad509d9972df2090 (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=5e2813bc7a5fc95e09da993384bad8801df476ee
commit 5e2813bc7a5fc95e09da993384bad8801df476ee
Merge: 6330c8f 16fddd0
Author: Brad King 
AuthorDate: Mon Sep 26 13:14:31 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 13:14:31 2016 -0400

Merge topic 'copyright-by-contributors' into next

16fddd04 Copyright.txt: Add notice of copyright by contributors


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16fddd040338061d5ed3b652fdbb1f6fc3d99240
commit 16fddd040338061d5ed3b652fdbb1f6fc3d99240
Author: Brad King 
AuthorDate: Mon Sep 26 11:04:16 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 26 11:44:34 2016 -0400

Copyright.txt: Add notice of copyright by contributors

We already have a note about source-level copyright by contributors.
Update the top-level notice to mention "Contributors" explicitly (but
not individually).

diff --git a/Copyright.txt b/Copyright.txt
index f8f..7b06205 100644
--- a/Copyright.txt
+++ b/Copyright.txt
@@ -1,5 +1,5 @@
 CMake - Cross Platform Makefile Generator
-Copyright 2000-2016 Kitware, Inc.
+Copyright 2000-2016 Kitware, Inc. and Contributors
 Copyright 2000-2011 Insight Software Consortium
 All rights reserved.
 
@@ -15,7 +15,7 @@ are met:
   documentation and/or other materials provided with the distribution.
 
 * Neither the names of Kitware, Inc., the Insight Software Consortium,
-  nor the names of their contributors may be used to endorse or promote
+  nor the names of their Contributors may be used to endorse or promote
   products derived from this software without specific prior written
   permission.
 
@@ -35,7 +35,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
DAMAGE.
 
 The above copyright and license notice applies to distributions of
 CMake in source and binary form.  Some source files contain additional
-notices of original copyright by their contributors; see each source
+notices of original copyright by their Contributors; see each source
 for details.  Third-party software packages supplied with CMake under
 compatible licenses provide their own copyright notices documented in
 corresponding subdirectories.

---

Summary of changes:
 Copyright.txt |6 +++---
 1 file changed, 3 insertions(+), 3 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.6.2-2493-g6330c8f

[Domen Vrankar]

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  6330c8f70b69e8aac2d05846ad509d9972df2090 (commit)
   via  d068b65db17fa6a07970e6640cb69e265746d1ae (commit)
  from  afe788b028034d796f0fc121eee557930fa73e75 (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=6330c8f70b69e8aac2d05846ad509d9972df2090
commit 6330c8f70b69e8aac2d05846ad509d9972df2090
Merge: afe788b d068b65
Author: Domen Vrankar 
AuthorDate: Mon Sep 26 11:00:53 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 11:00:53 2016 -0400

Merge topic 'cpack-rpm-debuginfo-sources' into next

d068b65d fixup! CPack/RPM debuginfo packages must contain sources


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d068b65db17fa6a07970e6640cb69e265746d1ae
commit d068b65db17fa6a07970e6640cb69e265746d1ae
Author: Domen Vrankar 
AuthorDate: Mon Sep 26 16:59:56 2016 +0200
Commit: Domen Vrankar 
CommitDate: Mon Sep 26 16:59:56 2016 +0200

fixup! CPack/RPM debuginfo packages must contain sources

diff --git a/Tests/RunCMake/CPack/DEBUGINFO.cmake 
b/Tests/RunCMake/CPack/DEBUGINFO.cmake
index ead7ad1..d98b682 100644
--- a/Tests/RunCMake/CPack/DEBUGINFO.cmake
+++ b/Tests/RunCMake/CPack/DEBUGINFO.cmake
@@ -1,5 +1,11 @@
 set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
 
+# PGI compiler doesn't add build id to binaries by default
+if(CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
+  string(APPEND CMAKE_EXE_LINKER_FLAGS "-Wl,--build-id")
+  string(APPEND CMAKE_SHARED_LINKER_FLAGS "-Wl,--build-id")
+endif()
+
 set(CPACK_RPM_COMPONENT_INSTALL "ON")
 
 set(CMAKE_BUILD_TYPE Debug)
diff --git a/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake 
b/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
deleted file mode 100644
index fea8db5..000
--- a/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-function(get_test_prerequirements found_var)
-  # for now PGI compiler is not supported as it doesn't set --build-id
-  # required by debuginfo rpm packages
-
-  if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
-set(${found_var} true PARENT_SCOPE)
-  endif()
-endfunction()

---

Summary of changes:
 Tests/RunCMake/CPack/DEBUGINFO.cmake |6 ++
 Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake |8 
 2 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake


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.6.2-2491-gafe788b

[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  afe788b028034d796f0fc121eee557930fa73e75 (commit)
   via  9bb8ac8ed28811f6097233b1065b71833a017c0f (commit)
  from  3f376968376366e0eb1b31145a2db94f53216f18 (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=afe788b028034d796f0fc121eee557930fa73e75
commit afe788b028034d796f0fc121eee557930fa73e75
Merge: 3f37696 9bb8ac8
Author: Brad King 
AuthorDate: Mon Sep 26 10:42:44 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 10:42:44 2016 -0400

Merge topic 'FindBoost-1.62' into next

9bb8ac8e FindBoost: update to 1.62


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9bb8ac8ed28811f6097233b1065b71833a017c0f
commit 9bb8ac8ed28811f6097233b1065b71833a017c0f
Author: Tatsuyuki Ishi 
AuthorDate: Sun Sep 25 16:53:03 2016 +0900
Commit: Tatsuyuki Ishi 
CommitDate: Sun Sep 25 16:53:03 2016 +0900

FindBoost: update to 1.62

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 1f03841..b3e8db9 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -742,6 +742,21 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
 set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono 
date_time atomic)
 set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
+  elseif(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 
106300)
+set(_Boost_CHRONO_DEPENDENCIES system)
+set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
+set(_Boost_COROUTINE_DEPENDENCIES context system)
+set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
+set(_Boost_FILESYSTEM_DEPENDENCIES system)
+set(_Boost_IOSTREAMS_DEPENDENCIES regex)
+set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread 
regex chrono atomic)
+set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 
math_tr1f math_tr1l atomic)
+set(_Boost_MPI_DEPENDENCIES serialization)
+set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
+set(_Boost_RANDOM_DEPENDENCIES system)
+set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
+set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono 
date_time atomic)
+set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
   else()
 message(WARNING "Imported targets not available for Boost version 
${Boost_VERSION}")
 set(_Boost_IMPORTED_TARGETS FALSE)
@@ -777,6 +792,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
   set(_Boost_COROUTINE_HEADERS   "boost/coroutine/all.hpp")
   set(_Boost_EXCEPTION_HEADERS   "boost/exception/exception.hpp")
   set(_Boost_DATE_TIME_HEADERS   "boost/date_time/date.hpp")
+  set(_Boost_FIBER_HEADERS   "boost/fiber/all.hpp")
   set(_Boost_FILESYSTEM_HEADERS  "boost/filesystem/path.hpp")
   set(_Boost_GRAPH_HEADERS   "boost/graph/adjacency_list.hpp")
   set(_Boost_GRAPH_PARALLEL_HEADERS  "boost/graph/adjacency_list.hpp")

---

Summary of changes:
 Modules/FindBoost.cmake |   16 
 1 file 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.6.2-2489-g3f37696

[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  3f376968376366e0eb1b31145a2db94f53216f18 (commit)
   via  1798e49595ca5b8aa113f98a8266ef5df582a207 (commit)
   via  d15b7603aeff5e7c47ce240329414b6a0db60720 (commit)
  from  54dbd51b5bee3e51cce3b1dc14f5a2d06308f866 (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=3f376968376366e0eb1b31145a2db94f53216f18
commit 3f376968376366e0eb1b31145a2db94f53216f18
Merge: 54dbd51 1798e49
Author: Brad King 
AuthorDate: Mon Sep 26 09:50:33 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 09:50:33 2016 -0400

Merge topic 'update-kwsys' into next

1798e495 Merge branch 'upstream-KWSys' into update-kwsys
d15b7603 KWSys 2016-09-23 (80f820fc)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1798e49595ca5b8aa113f98a8266ef5df582a207
commit 1798e49595ca5b8aa113f98a8266ef5df582a207
Merge: a721830 d15b760
Author: Brad King 
AuthorDate: Mon Sep 26 09:45:51 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 26 09:45:51 2016 -0400

Merge branch 'upstream-KWSys' into update-kwsys

* upstream-KWSys:
  KWSys 2016-09-23 (80f820fc)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d15b7603aeff5e7c47ce240329414b6a0db60720
commit d15b7603aeff5e7c47ce240329414b6a0db60720
Author: KWSys Upstream 
AuthorDate: Fri Sep 23 10:55:07 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 26 09:45:46 2016 -0400

KWSys 2016-09-23 (80f820fc)

Code extracted from:

http://public.kitware.com/KWSys.git

at commit 80f820fcbb7cb9536a7c3886fa60c5c211559daf (master).

Upstream Shortlog
-

Brad King (3):
  66cd1138 ConsoleBuf: Avoid unnecessary initializations in test code
  4e6c9410 ConsoleBuf: Remove extra flush operations from test code
  80f820fc ConsoleBuf: Avoid use of __FUNCTION__ in tests

diff --git a/testConsoleBuf.cxx b/testConsoleBuf.cxx
index 3dc3337..d7775e6 100644
--- a/testConsoleBuf.cxx
+++ b/testConsoleBuf.cxx
@@ -103,7 +103,7 @@ static void dumpBuffers(const T *expected, const T 
*received, size_t size) {
 }
 std::cerr << std::endl;
   }
-  std::cerr << std::endl << std::flush;
+  std::cerr << std::endl;
 }
 
 //
@@ -331,21 +331,23 @@ static int testPipe()
   didFail = encodedTestString.compare(buffer2) == 0 ? 0 : 1;
 }
 if (didFail != 0) {
-  std::cerr << "Pipe's output didn't match expected output!" << 
std::endl << std::flush;
+  std::cerr << "Pipe's output didn't match expected output!" << 
std::endl;
   dumpBuffers(encodedTestString.c_str(), buffer, 
encodedTestString.size());
   dumpBuffers(encodedInputTestString.c_str(), buffer + 
encodedTestString.size() + 1, encodedInputTestString.size());
   dumpBuffers(encodedTestString.c_str(), buffer2, 
encodedTestString.size());
 }
   } catch (const std::runtime_error ) {
 DWORD lastError = GetLastError();
-std::cerr << "In function " << __FUNCTION__ << ":" << ex.what() << 
std::endl << std::flush;
+std::cerr << "In function testPipe, line " <<  __LINE__ << ": "
+  << ex.what() << std::endl;
 displayError(lastError);
   }
   finishProcess(didFail == 0);
 }
   } catch (const std::runtime_error ) {
 DWORD lastError = GetLastError();
-std::cerr << "In function " << __FUNCTION__ << ":" << ex.what() << 
std::endl << std::flush;
+std::cerr << "In function testPipe, line " <<  __LINE__ << ": "
+  << ex.what() << std::endl;
 displayError(lastError);
   }
   finishPipe(inPipeRead, inPipeWrite);
@@ -368,11 +370,11 @@ static int testFile()
 (errFile = createFile(L"stderrFile.txt")) == INVALID_HANDLE_VALUE) {
   throw std::runtime_error("createFile failed!");
 }
-int length = 0;
 DWORD bytesWritten = 0;
 char buffer[200];
 char buffer2[200];
 
+int length;
 if ((length = WideCharToMultiByte(TestCodepage, 0, UnicodeInputTestString, 
-1,
   buffer, sizeof(buffer),
   NULL, NULL)) == 0) {
@@ -424,21 +426,23 @@ static int testFile()
   didFail = encodedTestString.compare(buffer2) == 0 ? 0 : 1;
 }
 if (didFail != 0) {
-  std::cerr << "File's output didn't match expected output!" 

[Cmake-commits] CMake branch, next, updated. v3.6.2-2481-gb948884

[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  b9488840e0a654f46aab074f4fd45be2f116b1ed (commit)
   via  a721830767c6a7819ed82cda5f910b732201f885 (commit)
   via  4d6f0a55731e462a53feb0956484c104ab8c1018 (commit)
   via  806017cab8c0dececc2bf61a4bf54c8cb031c8b6 (commit)
   via  d5fbb19b4995c9ed9dfc44b4b8e391ede21d3849 (commit)
   via  c6f07d06c610a9b1e6062d70ffc78c04bdf48ee4 (commit)
   via  d57a6493fc667f8a6ffa9fad2566a0cbea785ec5 (commit)
   via  e6a38a84d63b0c247a8f52bb5df76820db32f45e (commit)
   via  63c25013b143e1e945eeb35d419407fa1d4d24de (commit)
  from  faf942d8f24416635e776aec909ba356b2cd1d9e (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=b9488840e0a654f46aab074f4fd45be2f116b1ed
commit b9488840e0a654f46aab074f4fd45be2f116b1ed
Merge: faf942d a721830
Author: Brad King 
AuthorDate: Mon Sep 26 09:07:27 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 26 09:07:27 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.6.2-1166-gd57a649

[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  d57a6493fc667f8a6ffa9fad2566a0cbea785ec5 (commit)
   via  b36408a092b946568abbe935062e14aedadc161b (commit)
   via  7274fd9c1934d617464b752210ff16ee4f3c96fb (commit)
   via  ccd1341ac935d6ba479f3dc27b6041bff0c1c970 (commit)
   via  aaf4014c28d0d0bf5180dffd5c4a628406a5e7a1 (commit)
  from  e6a38a84d63b0c247a8f52bb5df76820db32f45e (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=d57a6493fc667f8a6ffa9fad2566a0cbea785ec5
commit d57a6493fc667f8a6ffa9fad2566a0cbea785ec5
Merge: e6a38a8 b36408a
Author: Brad King 
AuthorDate: Mon Sep 26 09:06:26 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 09:06:26 2016 -0400

Merge topic 'FindMatlab-simulink'

b36408a0 FindMatlab: Add notes for topic 'FindMatlab-simulink'
7274fd9c FindMatlab: Add EXECUTABLE, MODULE, and SHARED options to 
matlab_add_mex
ccd1341a FindMatlab: Add SIMULINK component
aaf4014c FindMatlab: Fix documentation


---

Summary of changes:
 Help/release/dev/FindMatlab-simulink.rst |4 +++
 Modules/FindMatlab.cmake |   47 ++
 2 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 Help/release/dev/FindMatlab-simulink.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.6.2-1180-ga721830

[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  a721830767c6a7819ed82cda5f910b732201f885 (commit)
   via  e6380b11e9d900c9b60ad6fbd46171092bf0136e (commit)
   via  67480c05e3f6819d867680775ca0cbc6f03f28da (commit)
  from  4d6f0a55731e462a53feb0956484c104ab8c1018 (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=a721830767c6a7819ed82cda5f910b732201f885
commit a721830767c6a7819ed82cda5f910b732201f885
Merge: 4d6f0a5 e6380b1
Author: Brad King 
AuthorDate: Mon Sep 26 09:06:41 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 09:06:41 2016 -0400

Merge topic 'auto-ptr'

e6380b11 Use std::auto_ptr on compilers that do not warn about it
67480c05 Add a feature check to test availability of auto_ptr


---

Summary of changes:
 Source/Checks/cm_cxx_auto_ptr.cxx   |   18 ++
 Source/Checks/cm_cxx_features.cmake |1 +
 Source/cmConfigure.cmake.h.in   |1 +
 Source/cm_auto_ptr.hxx  |   10 +-
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 Source/Checks/cm_cxx_auto_ptr.cxx


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.6.2-1161-ge6a38a8

[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  e6a38a84d63b0c247a8f52bb5df76820db32f45e (commit)
   via  b66bc6606e87c79e3adef55aa963570a5b8f78f2 (commit)
  from  63c25013b143e1e945eeb35d419407fa1d4d24de (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=e6a38a84d63b0c247a8f52bb5df76820db32f45e
commit e6a38a84d63b0c247a8f52bb5df76820db32f45e
Merge: 63c2501 b66bc66
Author: Brad King 
AuthorDate: Mon Sep 26 09:06:22 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 09:06:22 2016 -0400

Merge topic 'fortran-submodule-test'

b66bc660 Tests: Add Fortran submodule tests


---

Summary of changes:
 Tests/CMakeLists.txt   |1 +
 Tests/FortranModules/CMakeLists.txt|   31 +
 Tests/FortranModules/Submodules/CMakeLists.txt |1 +
 Tests/FortranModules/Submodules/main.f90   |5 +++
 Tests/FortranModules/Submodules/provide.f90|   57 
 5 files changed, 95 insertions(+)
 create mode 100644 Tests/FortranModules/Submodules/CMakeLists.txt
 create mode 100644 Tests/FortranModules/Submodules/main.f90
 create mode 100644 Tests/FortranModules/Submodules/provide.f90


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.6.2-1177-g4d6f0a5

[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  4d6f0a55731e462a53feb0956484c104ab8c1018 (commit)
   via  1ef45a30aae240a89893e86e2509d5400da9753f (commit)
  from  806017cab8c0dececc2bf61a4bf54c8cb031c8b6 (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=4d6f0a55731e462a53feb0956484c104ab8c1018
commit 4d6f0a55731e462a53feb0956484c104ab8c1018
Merge: 806017c 1ef45a3
Author: Brad King 
AuthorDate: Mon Sep 26 09:06:39 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 09:06:39 2016 -0400

Merge topic 'revert-cpack-deb-package-description-fallback'

1ef45a30 Revert "CPack/DEB: Make package description variable precedence 
match RPM"


---

Summary of changes:
 .../dev/cpack-deb-package-description-fallback.rst |   15 ---
 Modules/CPackDeb.cmake |   43 ++--
 ...LibCPackConfig-components-description1.cmake.in |6 +--
 ...LibCPackConfig-components-description2.cmake.in |6 +--
 ...CPackVerifyResult-components-description2.cmake |4 +-
 Tests/CPackComponentsDEB/pkg_description.txt   |1 -
 6 files changed, 28 insertions(+), 47 deletions(-)
 delete mode 100644 Help/release/dev/cpack-deb-package-description-fallback.rst
 delete mode 100644 Tests/CPackComponentsDEB/pkg_description.txt


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.6.2-1169-gc6f07d0

[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  c6f07d06c610a9b1e6062d70ffc78c04bdf48ee4 (commit)
   via  b35568f3f9f9b8f4b5b2a2e6f4d524540980c3ae (commit)
   via  49d50ad40719722236c7867bd69e7ab414224c49 (commit)
  from  d57a6493fc667f8a6ffa9fad2566a0cbea785ec5 (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=c6f07d06c610a9b1e6062d70ffc78c04bdf48ee4
commit c6f07d06c610a9b1e6062d70ffc78c04bdf48ee4
Merge: d57a649 b35568f
Author: Brad King 
AuthorDate: Mon Sep 26 09:06:29 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 09:06:29 2016 -0400

Merge topic 'xcode-swift-version'

b35568f3 Xcode: Add option to set Swift language version
49d50ad4 Xcode: Port rudimentary Swift support to Xcode 8


---

Summary of changes:
 Help/manual/cmake-variables.7.rst  |1 +
 Help/release/dev/xcode-swift-version.rst   |6 ++
 Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst |5 +
 Modules/CMakeDetermineCompilerId.cmake |5 +
 Modules/CompilerId/Xcode-3.pbxproj.in  |1 +
 Source/cmGlobalXCodeGenerator.cxx  |9 +
 Tests/SwiftOnly/CMakeLists.txt |4 
 7 files changed, 31 insertions(+)
 create mode 100644 Help/release/dev/xcode-swift-version.rst
 create mode 100644 Help/variable/CMAKE_Swift_LANGUAGE_VERSION.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, next, updated. v3.6.2-2472-gfaf942d

[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  faf942d8f24416635e776aec909ba356b2cd1d9e (commit)
   via  e6380b11e9d900c9b60ad6fbd46171092bf0136e (commit)
   via  67480c05e3f6819d867680775ca0cbc6f03f28da (commit)
  from  ccf06ce07151b3e67e8673976d74f03a081eb9de (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=faf942d8f24416635e776aec909ba356b2cd1d9e
commit faf942d8f24416635e776aec909ba356b2cd1d9e
Merge: ccf06ce e6380b1
Author: Brad King 
AuthorDate: Mon Sep 26 09:04:12 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 09:04:12 2016 -0400

Merge topic 'auto-ptr' into next

e6380b11 Use std::auto_ptr on compilers that do not warn about it
67480c05 Add a feature check to test availability of auto_ptr


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6380b11e9d900c9b60ad6fbd46171092bf0136e
commit e6380b11e9d900c9b60ad6fbd46171092bf0136e
Author: Daniel Pfeifer 
AuthorDate: Fri Sep 23 21:56:34 2016 +0200
Commit: Brad King 
CommitDate: Mon Sep 26 09:03:46 2016 -0400

Use std::auto_ptr on compilers that do not warn about it

diff --git a/Source/cm_auto_ptr.hxx b/Source/cm_auto_ptr.hxx
index f6c4362..f38eda5 100644
--- a/Source/cm_auto_ptr.hxx
+++ b/Source/cm_auto_ptr.hxx
@@ -14,7 +14,13 @@
 
 #include 
 
-// FIXME: Use std::auto_ptr on compilers that do not warn about it.
+#ifdef CMake_HAVE_CXX_AUTO_PTR
+
+#include 
+#define CM_AUTO_PTR std::auto_ptr
+
+#else
+
 #define CM_AUTO_PTR cm::auto_ptr
 
 // The HP compiler cannot handle the conversions necessary to use
@@ -219,3 +225,5 @@ public:
 #endif
 
 #endif
+
+#endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67480c05e3f6819d867680775ca0cbc6f03f28da
commit 67480c05e3f6819d867680775ca0cbc6f03f28da
Author: Daniel Pfeifer 
AuthorDate: Fri Sep 23 21:49:12 2016 +0200
Commit: Brad King 
CommitDate: Mon Sep 26 09:03:46 2016 -0400

Add a feature check to test availability of auto_ptr

diff --git a/Source/Checks/cm_cxx_auto_ptr.cxx 
b/Source/Checks/cm_cxx_auto_ptr.cxx
new file mode 100644
index 000..d3100fd
--- /dev/null
+++ b/Source/Checks/cm_cxx_auto_ptr.cxx
@@ -0,0 +1,18 @@
+#include 
+
+std::auto_ptr get_auto_ptr()
+{
+  std::auto_ptr ptr;
+  ptr = std::auto_ptr(new int(0));
+  return ptr;
+}
+
+int use_auto_ptr(std::auto_ptr ptr)
+{
+  return *ptr;
+}
+
+int main()
+{
+  return use_auto_ptr(get_auto_ptr());
+}
diff --git a/Source/Checks/cm_cxx_features.cmake 
b/Source/Checks/cm_cxx_features.cmake
index c6a532f..80c9f3b 100644
--- a/Source/Checks/cm_cxx_features.cmake
+++ b/Source/Checks/cm_cxx_features.cmake
@@ -32,6 +32,7 @@ function(cm_check_cxx_feature name)
 endfunction()
 
 if(CMAKE_CXX_STANDARD)
+  cm_check_cxx_feature(auto_ptr)
   cm_check_cxx_feature(make_unique)
   if(CMake_HAVE_CXX_MAKE_UNIQUE)
 set(CMake_HAVE_CXX_UNIQUE_PTR 1)
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in
index 8365367..8a1e81f 100644
--- a/Source/cmConfigure.cmake.h.in
+++ b/Source/cmConfigure.cmake.h.in
@@ -30,6 +30,7 @@
 #cmakedefine CMAKE_USE_MACH_PARSER
 #cmakedefine CMAKE_USE_LIBUV
 #cmakedefine CMAKE_ENCODING_UTF8
+#cmakedefine CMake_HAVE_CXX_AUTO_PTR
 #cmakedefine CMake_HAVE_CXX_MAKE_UNIQUE
 #cmakedefine CMake_HAVE_CXX_NULLPTR
 #cmakedefine CMake_HAVE_CXX_OVERRIDE

---

Summary of changes:


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.6.2-2469-gccf06ce

[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  ccf06ce07151b3e67e8673976d74f03a081eb9de (commit)
   via  06dea230ae7bb082a4b8fd38226791d0025792a8 (commit)
  from  db5b6bf630ddcee02f97bdf368440692250c8d34 (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=ccf06ce07151b3e67e8673976d74f03a081eb9de
commit ccf06ce07151b3e67e8673976d74f03a081eb9de
Merge: db5b6bf 06dea23
Author: Brad King 
AuthorDate: Mon Sep 26 09:02:26 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 09:02:26 2016 -0400

Merge topic 'CPackNSIS-per-component-install' into next

06dea230 CPack/NSIS: Add custom component install directory


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06dea230ae7bb082a4b8fd38226791d0025792a8
commit 06dea230ae7bb082a4b8fd38226791d0025792a8
Author: Roman Wüger 
AuthorDate: Fri Sep 23 09:28:35 2016 +0200
Commit: Brad King 
CommitDate: Mon Sep 26 09:01:59 2016 -0400

CPack/NSIS: Add custom component install directory

diff --git a/Modules/CPackNSIS.cmake b/Modules/CPackNSIS.cmake
index db5984a..4693ce5 100644
--- a/Modules/CPackNSIS.cmake
+++ b/Modules/CPackNSIS.cmake
@@ -96,6 +96,11 @@
 #  Contact information for questions and comments about the installation
 #  process.
 #
+# .. variable:: CPACK_NSIS__INSTALL_DIRECTORY
+#
+#  Custom install directory for the specified component  instead
+#  of $INSTDIR.
+#
 # .. variable:: CPACK_NSIS_CREATE_ICONS_EXTRA
 #
 #  Additional NSIS commands for creating start menu shortcuts.
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx 
b/Source/CPack/cmCPackNSISGenerator.cxx
index 2db94f1..b49da7f 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -71,14 +71,26 @@ int cmCPackNSISGenerator::PackageFiles()
   std::ostringstream str;
   std::vector::const_iterator it;
   for (it = files.begin(); it != files.end(); ++it) {
+std::string outputDir = "$INSTDIR";
 std::string fileN =
   cmSystemTools::RelativePath(toplevel.c_str(), it->c_str());
 if (!this->Components.empty()) {
+  const std::string::size_type pos = fileN.find('/');
+
+  // Use the custom component install directory if we have one
+  if (pos != std::string::npos) {
+const std::string componentName = fileN.substr(0, pos);
+outputDir = CustomComponentInstallDirectory(componentName);
+  } else {
+outputDir = CustomComponentInstallDirectory(fileN);
+  }
+
   // Strip off the component part of the path.
-  fileN = fileN.substr(fileN.find('/') + 1, std::string::npos);
+  fileN = fileN.substr(pos + 1, std::string::npos);
 }
 std::replace(fileN.begin(), fileN.end(), '/', '\\');
-str << "  Delete \"$INSTDIR\\" << fileN << "\"" << std::endl;
+
+str << "  Delete \"" << outputDir << "\\" << fileN << "\"" << std::endl;
   }
   cmCPackLogger(cmCPackLog::LOG_DEBUG, "Uninstall Files: " << str.str()
<< std::endl);
@@ -108,7 +120,12 @@ int cmCPackNSISGenerator::PackageFiles()
   }
 }
 std::replace(fileN.begin(), fileN.end(), '/', '\\');
-dstr << "  RMDir \"$INSTDIR\\" << fileN << "\"" << std::endl;
+
+const std::string componentOutputDir =
+  CustomComponentInstallDirectory(componentName);
+
+dstr << "  RMDir \"" << componentOutputDir << "\\" << fileN << "\""
+ << std::endl;
 if (!componentName.empty()) {
   this->Components[componentName].Directories.push_back(fileN);
 }
@@ -650,7 +667,10 @@ std::string 
cmCPackNSISGenerator::CreateComponentDescription(
 }
 componentCode += "  SectionIn" + out.str() + "\n";
   }
-  componentCode += "  SetOutPath \"$INSTDIR\"\n";
+
+  const std::string componentOutputDir =
+CustomComponentInstallDirectory(component->Name);
+  componentCode += "  SetOutPath \"" + componentOutputDir + "\"\n";
 
   // Create the actual installation commands
   if (component->IsDownloaded) {
@@ -796,13 +816,13 @@ std::string 
cmCPackNSISGenerator::CreateComponentDescription(
++pathIt) {
 path = *pathIt;
 std::replace(path.begin(), path.end(), '/', '\\');
-macrosOut << "  Delete \"$INSTDIR\\" << path << "\"\n";
+macrosOut << "  Delete \"" << componentOutputDir << "\\" << path << "\"\n";
   }
   for (pathIt = component->Directories.begin();
pathIt != component->Directories.end(); ++pathIt) {
 path = *pathIt;
 std::replace(path.begin(), path.end(), '/', '\\');
-macrosOut << "  RMDir \"$INSTDIR\\" 

[Cmake-commits] CMake branch, next, updated. v3.6.2-2467-gdb5b6bf

[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  db5b6bf630ddcee02f97bdf368440692250c8d34 (commit)
   via  69a613221109a2a5c77e0469a49a95291e3a841d (commit)
  from  a76645452f07c807260d975ffdbdeba605682d0f (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=db5b6bf630ddcee02f97bdf368440692250c8d34
commit db5b6bf630ddcee02f97bdf368440692250c8d34
Merge: a766454 69a6132
Author: Brad King 
AuthorDate: Mon Sep 26 09:01:50 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 09:01:50 2016 -0400

Merge topic 'CPackNSIS-per-component-install' into next

69a61322 CPack/NSIS fix custom component install directory for the 
uninstaller


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69a613221109a2a5c77e0469a49a95291e3a841d
commit 69a613221109a2a5c77e0469a49a95291e3a841d
Author: Roman Wüger 
AuthorDate: Sat Sep 24 23:24:39 2016 +0200
Commit: Roman Wüger 
CommitDate: Sat Sep 24 23:24:39 2016 +0200

CPack/NSIS fix custom component install directory for the uninstaller

diff --git a/Source/CPack/cmCPackNSISGenerator.cxx 
b/Source/CPack/cmCPackNSISGenerator.cxx
index 168a437..b49da7f 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -75,10 +75,7 @@ int cmCPackNSISGenerator::PackageFiles()
 std::string fileN =
   cmSystemTools::RelativePath(toplevel.c_str(), it->c_str());
 if (!this->Components.empty()) {
-  const size_t pos = fileN.find('/');
-
-  // Strip off the component part of the path.
-  fileN = fileN.substr(pos + 1, std::string::npos);
+  const std::string::size_type pos = fileN.find('/');
 
   // Use the custom component install directory if we have one
   if (pos != std::string::npos) {
@@ -87,6 +84,9 @@ int cmCPackNSISGenerator::PackageFiles()
   } else {
 outputDir = CustomComponentInstallDirectory(fileN);
   }
+
+  // Strip off the component part of the path.
+  fileN = fileN.substr(pos + 1, std::string::npos);
 }
 std::replace(fileN.begin(), fileN.end(), '/', '\\');
 
@@ -122,7 +122,7 @@ int cmCPackNSISGenerator::PackageFiles()
 std::replace(fileN.begin(), fileN.end(), '/', '\\');
 
 const std::string componentOutputDir =
-  CustomComponentInstallDirectory(fileN);
+  CustomComponentInstallDirectory(componentName);
 
 dstr << "  RMDir \"" << componentOutputDir << "\\" << fileN << "\""
  << std::endl;

---

Summary of changes:
 Source/CPack/cmCPackNSISGenerator.cxx |   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.6.2-2465-ga766454

[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  a76645452f07c807260d975ffdbdeba605682d0f (commit)
   via  b35568f3f9f9b8f4b5b2a2e6f4d524540980c3ae (commit)
  from  e4d782024d3c654c216bbd32d6ad80f43dde5c29 (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=a76645452f07c807260d975ffdbdeba605682d0f
commit a76645452f07c807260d975ffdbdeba605682d0f
Merge: e4d7820 b35568f
Author: Brad King 
AuthorDate: Mon Sep 26 08:46:54 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 26 08:46:54 2016 -0400

Merge topic 'xcode-swift-version' into next

b35568f3 Xcode: Add option to set Swift language version


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b35568f3f9f9b8f4b5b2a2e6f4d524540980c3ae
commit b35568f3f9f9b8f4b5b2a2e6f4d524540980c3ae
Author: Brad King 
AuthorDate: Fri Sep 23 13:25:35 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 26 08:46:23 2016 -0400

Xcode: Add option to set Swift language version

Create a new CMAKE_Swift_LANGUAGE_VERSION variable to specify the
SWIFT_VERSION attribute in a generated Xcode project.  Ideally this
would be a `_STANDARD` property but since Swift support is
very minimal we should reserve that property for more complete
treatment later.

Issue: #16326

diff --git a/Help/manual/cmake-variables.7.rst 
b/Help/manual/cmake-variables.7.rst
index 9e0efe9..d9da3d6 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -396,6 +396,7 @@ Variables for Languages
/variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS
/variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES
/variable/CMAKE_LANG_STANDARD_LIBRARIES
+   /variable/CMAKE_Swift_LANGUAGE_VERSION
/variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG
 
 Variables for CTest
diff --git a/Help/release/dev/xcode-swift-version.rst 
b/Help/release/dev/xcode-swift-version.rst
new file mode 100644
index 000..5dff23c
--- /dev/null
+++ b/Help/release/dev/xcode-swift-version.rst
@@ -0,0 +1,6 @@
+xcode-swift-version
+---
+
+* The :generator:`Xcode` generator's rudimentary Swift language support
+  learned to honor a new :variable:`CMAKE_Swift_LANGUAGE_VERSION` variable
+  to tell Xcode what version of Swift is used by the source.
diff --git a/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst 
b/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst
new file mode 100644
index 000..50121e2
--- /dev/null
+++ b/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst
@@ -0,0 +1,5 @@
+CMAKE_Swift_LANGUAGE_VERSION
+
+
+Set to the Swift language version number.  If not set, the legacy "2.3"
+version is assumed.
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 42d97db..0d5de06 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2997,7 +2997,13 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
 this->CreateString(this->GeneratorToolset));
   }
   if (this->GetLanguageEnabled("Swift")) {
-buildSettings->AddAttribute("SWIFT_VERSION", this->CreateString("2.3"));
+std::string swiftVersion = "2.3";
+if (const char* vers = this->CurrentMakefile->GetDefinition(
+  "CMAKE_Swift_LANGUAGE_VERSION")) {
+  swiftVersion = vers;
+}
+buildSettings->AddAttribute("SWIFT_VERSION",
+this->CreateString(swiftVersion));
   }
 
   std::string symroot = root->GetCurrentBinaryDirectory();
diff --git a/Tests/SwiftOnly/CMakeLists.txt b/Tests/SwiftOnly/CMakeLists.txt
index 5cb9739..cf4463c 100644
--- a/Tests/SwiftOnly/CMakeLists.txt
+++ b/Tests/SwiftOnly/CMakeLists.txt
@@ -1,4 +1,8 @@
 cmake_minimum_required(VERSION 3.3)
 project(SwiftOnly Swift)
 
+if(NOT XCODE_VERSION VERSION_LESS 8.0)
+  set(CMAKE_Swift_LANGUAGE_VERSION 3.0)
+endif()
+
 add_executable(SwiftOnly main.swift)

---

Summary of changes:


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