date:20170328

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc3-613-gae2232a

2017-03-28 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, next has been updated
  discards  896e195588bde813ad6e0cc8af7fe1594d37907c (commit)
  discards  10a48e620ee872e32642ed5ad1e993776be2a694 (commit)
  discards  eb3978b6688c4233a42b890ebc26e278940942b1 (commit)
  discards  bc35c1bb7b1175e79dd8bc177fb47f8367fae26b (commit)
  discards  3b32fdc5d1530368b5b05d009f59bca79759d1c1 (commit)
   via  ae2232a4e86e21e52f73c709feb729bd94271dca (commit)
   via  ccd7ef0b1fafe7581cb110702288cde898e18418 (commit)
   via  84804eb5b3f33d97f3ecb5902a5df280ec2d4f9e (commit)
   via  2cc0ea8d610b1b88b4494d0b39da1d6f848758ef (commit)
   via  62fe278118632236b3adcdbc0717e9f0088d331d (commit)
   via  3e4e6594da5668d7f80a1192594d9ee4fc790eb8 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (896e195588bde813ad6e0cc8af7fe1594d37907c)
\
 N -- N -- N (ae2232a4e86e21e52f73c709feb729bd94271dca)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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=ae2232a4e86e21e52f73c709feb729bd94271dca
commit ae2232a4e86e21e52f73c709feb729bd94271dca
Merge: ccd7ef0 dc5ea8e
Author: Gregor Jasny 
AuthorDate: Tue Mar 28 19:52:02 2017 +
Commit: Kitware Robot 
CommitDate: Wed Mar 29 00:01:37 2017 -0400

Stage topic '16742-swift-3.0'

Topic-id: 23323
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/638


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccd7ef0b1fafe7581cb110702288cde898e18418
commit ccd7ef0b1fafe7581cb110702288cde898e18418
Merge: 84804eb fff3493
Author: Brad King 
AuthorDate: Tue Mar 28 18:23:38 2017 +
Commit: Kitware Robot 
CommitDate: Wed Mar 29 00:01:36 2017 -0400

Stage topic 'vs-rc-defines'

Topic-id: 23329
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/640

diff --cc Source/cmVisualStudioGeneratorOptions.cxx
index 1ca6b9c,da6f9a7..abc4924
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@@ -395,16 -259,19 +396,18 @@@ void cmVisualStudioGeneratorOptions::Ou
  if (!this->Configuration.empty()) {
fout << prefix;
this->TargetGenerator->WritePlatformConfigTag(
 -"PreprocessorDefinitions", this->Configuration.c_str(), 0, 0, 0,
 -);
 +tag, this->Configuration.c_str(), 0, 0, 0, );
  } else {
 -  fout << prefix << "";
 +  fout << prefix << "<" << tag << ">";
  }
} else {
 -fout << prefix << "PreprocessorDefinitions=\"";
 +fout << prefix << tag << "=\"";
}
const char* sep = "";
+   std::vector::const_iterator de =
+ cmRemoveDuplicates(this->Defines);
for (std::vector::const_iterator di = this->Defines.begin();
-di != this->Defines.end(); ++di) {
+di != de; ++di) {
  // Escape the definition for the compiler.
  std::string define;
  if (this->Version < cmGlobalVisualStudioGenerator::VS10) {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84804eb5b3f33d97f3ecb5902a5df280ec2d4f9e
commit 84804eb5b3f33d97f3ecb5902a5df280ec2d4f9e
Merge: 2cc0ea8 62b85c9
Author: Brad King 
AuthorDate: Tue Mar 28 17:40:51 2017 +
Commit: Kitware Robot 
CommitDate: Wed Mar 29 00:01:36 2017 -0400

Stage topic 'sphinx-cmake-theme'

Topic-id: 23330
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/641


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cc0ea8d610b1b88b4494d0b39da1d6f848758ef
commit 2cc0ea8d610b1b88b4494d0b39da1d6f848758ef
Merge: 62fe278 7a411df
Author: Brad King 
AuthorDate: Tue Mar 28 14:39:31 2017 +
Commit: Kitware Robot 
CommitDate: Wed Mar 29 00:01:36 2017 -0400

Stage topic 'vfproj-object-libs-fix'

Topic-id: 23318
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/636


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62fe278118632236b3adcdbc0717e9f0088d331d
commit 62fe278118632236b3adcdbc0717e9f0088d331d
Merge: 3e4e659 cdd2875
Author: Brad King 
AuthorDate: Tue Mar 28 14:19:54 2017 +
Commit:

[Cmake-commits] CMake branch, master, updated. v3.8.0-rc3-598-g3e4e659

2017-03-28 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  3e4e6594da5668d7f80a1192594d9ee4fc790eb8 (commit)
  from  cc4fbda1a9fffd8927de870643f167f066b26bcd (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 -
---

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, nightly, updated. v3.8.0-rc3-612-g896e195

2017-03-28 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, nightly has been updated
  discards  c4c307b8259c39737019ddd1b7d7ce4b5cf89c15 (commit)
  discards  c7df2fb6528c884ec69bedce2a4595997adc72ac (commit)
  discards  b645aace61d04f73a26faa5496b3ae49f215e1b4 (commit)
   via  896e195588bde813ad6e0cc8af7fe1594d37907c (commit)
   via  dc5ea8ee24a81a7b5e9a05232c00a4e85528641c (commit)
   via  10a48e620ee872e32642ed5ad1e993776be2a694 (commit)
   via  eb3978b6688c4233a42b890ebc26e278940942b1 (commit)
   via  62b85c940622bdcc25964ed95bec68a562de59ee (commit)
   via  fff34934e70da77c359e47c53ffd04701bcd7611 (commit)
   via  79a915383fd0c0e55bf0ca5fe5b3cf07d1823aa7 (commit)
   via  c77194ec471dd4f039c0c30e05f0b519ab44bc14 (commit)
   via  1449f6f63d09f21203b36b3485dd3eb60c73ac17 (commit)
   via  8a619e8c85def632e9e7938fc5a3a36bb22f46ff (commit)
   via  bc35c1bb7b1175e79dd8bc177fb47f8367fae26b (commit)
   via  7a411dfbf6d9987869fd39e57f38f6a9c3d548aa (commit)
   via  3b32fdc5d1530368b5b05d009f59bca79759d1c1 (commit)
   via  cdd2875ad2f1d5e0b0bc92ca1dff4f0c14d3424b (commit)
   via  e9c5505bf9c51c34dea703b86a293ff04475db54 (commit)
   via  cc4fbda1a9fffd8927de870643f167f066b26bcd (commit)
   via  3d3eacbb6115f39ba40f8c2fa48f9cf84ba210e9 (commit)
   via  83199f8daf13328a4fb97c16476c3a0da4228ead (commit)
   via  4d970868489e7a7a45419ad7afe2ab8239ee (commit)
   via  21499431e05b0defb134b10b1753488c0516bafd (commit)
   via  85abc5f5aa5f8afbca88e7b3e1c919db49756ecb (commit)
   via  8c94f5085d24bbc25f3f7fa421f7a62761a5515c (commit)
   via  3ed87b7ee1038f11e7d86988aca692c0773209b6 (commit)
   via  16cd8600683a0e144f31a2e2551013283458f231 (commit)
   via  2b350775d212835a39cf541bbb46aec0a7bf52cf (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (c4c307b8259c39737019ddd1b7d7ce4b5cf89c15)
\
 N -- N -- N (896e195588bde813ad6e0cc8af7fe1594d37907c)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 -
---

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |8 +++-
 Modules/CMakeRCInformation.cmake   |   17 -
 Modules/Platform/Windows-MSVC.cmake|3 +++
 Source/CMakeVersion.cmake  |2 +-
 Source/cmGlobalXCodeGenerator.cxx  |6 +-
 Source/cmIDEOptions.cxx|5 +
 Source/cmIDEOptions.h  |2 ++
 Source/cmLocalVisualStudio7Generator.cxx   |   10 ++
 Source/cmVisualStudio10TargetGenerator.cxx |   12 +++-
 Source/cmVisualStudioGeneratorOptions.cxx  |5 -
 Source/kwsys/FStream.hxx.in|4 ++--
 Tests/SwiftMix/ObjCMain.m  |8 +++-
 Tests/SwiftMix/SwiftMain.swift |7 +++
 Utilities/Sphinx/conf.py.in|   20 
 14 files changed, 92 insertions(+), 17 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, nightly-master, updated. v3.8.0-rc3-597-gcc4fbda

2017-03-28 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, nightly-master has been updated
   via  cc4fbda1a9fffd8927de870643f167f066b26bcd (commit)
   via  3d3eacbb6115f39ba40f8c2fa48f9cf84ba210e9 (commit)
   via  83199f8daf13328a4fb97c16476c3a0da4228ead (commit)
   via  4d970868489e7a7a45419ad7afe2ab8239ee (commit)
   via  21499431e05b0defb134b10b1753488c0516bafd (commit)
   via  85abc5f5aa5f8afbca88e7b3e1c919db49756ecb (commit)
   via  9dfccdc227f530997203ab9eb509a861f6718f59 (commit)
   via  8c94f5085d24bbc25f3f7fa421f7a62761a5515c (commit)
   via  92fe00d33cb029a583de20a16e5bc17bd337ed57 (commit)
   via  3ed87b7ee1038f11e7d86988aca692c0773209b6 (commit)
   via  6eb609fd59d989fede93fadfc67b928ee7ab7fc2 (commit)
   via  cf784d9ffeda82d6790c359b6d6ea7f88345 (commit)
   via  082c0375d9f21ada36bdd8fd710720e553bcdbbb (commit)
   via  16cd8600683a0e144f31a2e2551013283458f231 (commit)
   via  2b350775d212835a39cf541bbb46aec0a7bf52cf (commit)
  from  89e2c92f546c3d1b702b2c0ca206eabfc3f7caab (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 -
---

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake   |   26 +---
 Source/CMakeVersion.cmake  |2 +-
 Source/cmCMakeHostSystemInformationCommand.cxx |   13 
 Source/cmNinjaNormalTargetGenerator.cxx|   14 -
 4 files changed, 42 insertions(+), 13 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.8.0-rc3-612-g896e195

2017-03-28 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, next has been updated
   via  896e195588bde813ad6e0cc8af7fe1594d37907c (commit)
   via  dc5ea8ee24a81a7b5e9a05232c00a4e85528641c (commit)
  from  10a48e620ee872e32642ed5ad1e993776be2a694 (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=896e195588bde813ad6e0cc8af7fe1594d37907c
commit 896e195588bde813ad6e0cc8af7fe1594d37907c
Merge: 10a48e6 dc5ea8e
Author: Gregor Jasny 
AuthorDate: Tue Mar 28 19:52:02 2017 +
Commit: Kitware Robot 
CommitDate: Tue Mar 28 15:52:10 2017 -0400

Stage topic '16742-swift-3.0'

Topic-id: 23323
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/638


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc5ea8ee24a81a7b5e9a05232c00a4e85528641c
commit dc5ea8ee24a81a7b5e9a05232c00a4e85528641c
Author: Gregor Jasny 
AuthorDate: Tue Mar 28 16:04:02 2017 +0200
Commit: Gregor Jasny 
CommitDate: Tue Mar 28 21:07:52 2017 +0200

Swift: Default to Swift 3.0 with Xcode 8.3 and later

Xcode 8.3 has dropped support for Swift 2.3 so that compiler and
feature detection failed.

Closes #16742

diff --git a/Modules/CMakeDetermineCompilerId.cmake 
b/Modules/CMakeDetermineCompilerId.cmake
index 6fce8e2..1abbc01 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -298,7 +298,13 @@ Id flags: ${testflags} 
${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
   set(id_toolset "")
 endif()
 if("${lang}" STREQUAL "Swift")
-  set(id_lang_version "SWIFT_VERSION = 2.3;")
+  if(CMAKE_Swift_LANGUAGE_VERSION)
+set(id_lang_version "SWIFT_VERSION = ${CMAKE_Swift_LANGUAGE_VERSION};")
+  elseif(XCODE_VERSION VERSION_GREATER_EQUAL 8.3)
+set(id_lang_version "SWIFT_VERSION = 3.0;")
+  else()
+set(id_lang_version "SWIFT_VERSION = 2.3;")
+  endif()
 else()
   set(id_lang_version "")
 endif()
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 39f7b8f..42dd997 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3117,10 +3117,14 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
 this->CreateString(this->GeneratorToolset));
   }
   if (this->GetLanguageEnabled("Swift")) {
-std::string swiftVersion = "2.3";
+std::string swiftVersion;
 if (const char* vers = this->CurrentMakefile->GetDefinition(
   "CMAKE_Swift_LANGUAGE_VERSION")) {
   swiftVersion = vers;
+} else if (this->XcodeVersion >= 83) {
+  swiftVersion = "3.0";
+} else {
+  swiftVersion = "2.3";
 }
 buildSettings->AddAttribute("SWIFT_VERSION",
 this->CreateString(swiftVersion));
diff --git a/Tests/SwiftMix/ObjCMain.m b/Tests/SwiftMix/ObjCMain.m
index 7fa90ae..5a8700c 100644
--- a/Tests/SwiftMix/ObjCMain.m
+++ b/Tests/SwiftMix/ObjCMain.m
@@ -1,4 +1,10 @@
 #import "SwiftMix-Swift.h"
 int ObjCMain(int argc, char const* const argv[]) {
-  return [SwiftMainClass SwiftMain:argc argv:argv];
+  if ([SwiftMainClass respondsToSelector:@selector(SwiftMain:argv:)]) {
+return [SwiftMainClass SwiftMain:argc argv:argv];
+  }
+  if ([SwiftMainClass respondsToSelector:@selector(SwiftMainWithArgc:argv:)]) {
+return [SwiftMainClass SwiftMainWithArgc:argc argv:argv];
+  }
+  return -1;
 }
diff --git a/Tests/SwiftMix/SwiftMain.swift b/Tests/SwiftMix/SwiftMain.swift
index 3629ac8..921439a 100644
--- a/Tests/SwiftMix/SwiftMain.swift
+++ b/Tests/SwiftMix/SwiftMain.swift
@@ -3,10 +3,17 @@ import Foundation
 @objc class SwiftMainClass : NSObject {
   class func SwiftMain(argc:Int, argv:UnsafePointer) -> 
Int32 {
 dump("argc: \(argc)")
+#if swift(>=3.0)
+for i in 0 ..< argc {
+  let argi = String(cString:argv[i]);
+  dump("arg[\(i)]: \(argi)");
+}
+#else
 for (var i = 0; i < argc; ++i) {
   let argi = String.fromCString(argv[i])
   dump("arg[\(i)]: \(argi)");
 }
+#endif
 return 0;
   }
 }

---

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |8 +++-
 Source/cmGlobalXCodeGenerator.cxx  |6 +-
 Tests/SwiftMix/ObjCMain.m  |8 +++-
 Tests/SwiftMix/SwiftMain.swift |7 +++
 4 files changed, 26 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc3-610-g10a48e6

2017-03-28 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, next has been updated
   via  10a48e620ee872e32642ed5ad1e993776be2a694 (commit)
   via  fff34934e70da77c359e47c53ffd04701bcd7611 (commit)
   via  79a915383fd0c0e55bf0ca5fe5b3cf07d1823aa7 (commit)
   via  c77194ec471dd4f039c0c30e05f0b519ab44bc14 (commit)
   via  1449f6f63d09f21203b36b3485dd3eb60c73ac17 (commit)
   via  8a619e8c85def632e9e7938fc5a3a36bb22f46ff (commit)
  from  eb3978b6688c4233a42b890ebc26e278940942b1 (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=10a48e620ee872e32642ed5ad1e993776be2a694
commit 10a48e620ee872e32642ed5ad1e993776be2a694
Merge: eb3978b fff3493
Author: Brad King 
AuthorDate: Tue Mar 28 18:23:38 2017 +
Commit: Kitware Robot 
CommitDate: Tue Mar 28 14:24:54 2017 -0400

Stage topic 'vs-rc-defines'

Topic-id: 23329
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/640

diff --cc Source/cmVisualStudioGeneratorOptions.cxx
index 1ca6b9c,da6f9a7..abc4924
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@@ -395,16 -259,19 +396,18 @@@ void cmVisualStudioGeneratorOptions::Ou
  if (!this->Configuration.empty()) {
fout << prefix;
this->TargetGenerator->WritePlatformConfigTag(
 -"PreprocessorDefinitions", this->Configuration.c_str(), 0, 0, 0,
 -);
 +tag, this->Configuration.c_str(), 0, 0, 0, );
  } else {
 -  fout << prefix << "";
 +  fout << prefix << "<" << tag << ">";
  }
} else {
 -fout << prefix << "PreprocessorDefinitions=\"";
 +fout << prefix << tag << "=\"";
}
const char* sep = "";
+   std::vector::const_iterator de =
+ cmRemoveDuplicates(this->Defines);
for (std::vector::const_iterator di = this->Defines.begin();
-di != this->Defines.end(); ++di) {
+di != de; ++di) {
  // Escape the definition for the compiler.
  std::string define;
  if (this->Version < cmGlobalVisualStudioGenerator::VS10) {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fff34934e70da77c359e47c53ffd04701bcd7611
commit fff34934e70da77c359e47c53ffd04701bcd7611
Author: Brad King 
AuthorDate: Tue Mar 28 13:04:37 2017 -0400
Commit: Brad King 
CommitDate: Tue Mar 28 13:10:56 2017 -0400

MSVC: Restore _DEBUG preprocessor definition in RC debug builds

In commit v3.8.0-rc1~304^2 (MSVC: Do not define _DEBUG explicitly when
using /MDd, 2016-11-15) we removed the `_DEBUG` preprocessor definition
from MSVC C and C++ flags because the `cl` compiler automatically
defines it in Debug builds anyway.  However, the VS generators propagate
C preprocessor definitions to the RC (Windows Resource Compiler) tool.
This means that we used to explicitly define `_DEBUG` for RC debug
builds.  Therefore existing project code may expect the definition to be
there even though the `rc` compiler itself does not implicitly define
`_DEBUG` in debug builds.

Add the `_DEBUG` flag to the default `CMAKE_RC_FLAGS_DEBUG` instead
to restore this definition for RC debug builds.  This also makes it
available consistently in VS, Ninja, and Makefile generators.

Fixes: #16745

diff --git a/Modules/Platform/Windows-MSVC.cmake 
b/Modules/Platform/Windows-MSVC.cmake
index 31b26b59..e4aca6e 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -310,6 +310,9 @@ macro(__windows_compiler_msvc lang)
   if(NOT CMAKE_RC_FLAGS_INIT)
 string(APPEND CMAKE_RC_FLAGS_INIT " ${_PLATFORM_DEFINES} 
${_PLATFORM_DEFINES_${lang}}")
   endif()
+  if(NOT CMAKE_RC_FLAGS_DEBUG_INIT)
+string(APPEND CMAKE_RC_FLAGS_DEBUG_INIT " /D_DEBUG")
+  endif()
 
   enable_language(RC)
   set(CMAKE_NINJA_CMCLDEPS_RC 1)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79a915383fd0c0e55bf0ca5fe5b3cf07d1823aa7
commit 79a915383fd0c0e55bf0ca5fe5b3cf07d1823aa7
Author: Brad King 
AuthorDate: Tue Mar 28 13:03:56 2017 -0400
Commit: Brad King 
CommitDate: Tue Mar 28 13:10:55 2017 -0400

RC: Add missing CMAKE_RC_FLAGS_ entries to cache

diff --git a/Modules/CMakeRCInformation.cmake b/Modules/CMakeRCInformation.cmake
index 10f2cfb..7ddd297 100644
--- a/Modules/CMakeRCInformation.cmake
+++ b/Modules/CMakeRCInformation.cmake
@@ -17,11 +17,26 @@ set(CMAKE_SYSTEM_AND_RC_COMPILER_INFO_FILE
   ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc3-604-geb3978b

2017-03-28 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, next has been updated
   via  eb3978b6688c4233a42b890ebc26e278940942b1 (commit)
   via  62b85c940622bdcc25964ed95bec68a562de59ee (commit)
  from  bc35c1bb7b1175e79dd8bc177fb47f8367fae26b (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=eb3978b6688c4233a42b890ebc26e278940942b1
commit eb3978b6688c4233a42b890ebc26e278940942b1
Merge: bc35c1b 62b85c9
Author: Brad King 
AuthorDate: Tue Mar 28 17:40:51 2017 +
Commit: Kitware Robot 
CommitDate: Tue Mar 28 13:40:53 2017 -0400

Stage topic 'sphinx-cmake-theme'

Topic-id: 23330
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/641


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62b85c940622bdcc25964ed95bec68a562de59ee
commit 62b85c940622bdcc25964ed95bec68a562de59ee
Author: Matthew Woehlke 
AuthorDate: Tue Mar 28 13:24:47 2017 -0400
Commit: Brad King 
CommitDate: Tue Mar 28 13:38:42 2017 -0400

Utilities/Sphinx: Use brighter colors for html theme

Set Sphinx `html_theme_options` to give the generated documentation a
brighter and softer look than the default colors.

diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
index e3afc78..7878ad2 100644
--- a/Utilities/Sphinx/conf.py.in
+++ b/Utilities/Sphinx/conf.py.in
@@ -54,6 +54,26 @@ html_show_sourcelink = True
 html_static_path = ['@conf_path@/static']
 html_style = 'cmake.css'
 html_theme = 'default'
+html_theme_options = {
+'footerbgcolor':'#00182d',
+'footertextcolor':  '#ff',
+'sidebarbgcolor':   '#e4ece8',
+'sidebarbtncolor':  '#00a94f',
+'sidebartextcolor': '#33',
+'sidebarlinkcolor': '#00a94f',
+'relbarbgcolor':'#00529b',
+'relbartextcolor':  '#ff',
+'relbarlinkcolor':  '#ff',
+'bgcolor':  '#ff',
+'textcolor':'#44',
+'headbgcolor':  '#f2f2f2',
+'headtextcolor':'#003564',
+'headlinkcolor':'#3d8ff2',
+'linkcolor':'#2b63a8',
+'visitedlinkcolor': '#2b63a8',
+'codebgcolor':  '#ee',
+'codetextcolor':'#33',
+}
 html_title = 'CMake %s Documentation' % release
 html_short_title = '%s Documentation' % release
 html_favicon = '@conf_path@/static/cmake-favicon.ico'

---

Summary of changes:
 Utilities/Sphinx/conf.py.in |   20 
 1 file changed, 20 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.8.0-rc3-602-gbc35c1b

2017-03-28 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, next has been updated
   via  bc35c1bb7b1175e79dd8bc177fb47f8367fae26b (commit)
   via  7a411dfbf6d9987869fd39e57f38f6a9c3d548aa (commit)
  from  3b32fdc5d1530368b5b05d009f59bca79759d1c1 (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=bc35c1bb7b1175e79dd8bc177fb47f8367fae26b
commit bc35c1bb7b1175e79dd8bc177fb47f8367fae26b
Merge: 3b32fdc 7a411df
Author: Brad King 
AuthorDate: Tue Mar 28 14:39:31 2017 +
Commit: Kitware Robot 
CommitDate: Tue Mar 28 10:39:33 2017 -0400

Stage topic 'vfproj-object-libs-fix'

Topic-id: 23318
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/636


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a411dfbf6d9987869fd39e57f38f6a9c3d548aa
commit 7a411dfbf6d9987869fd39e57f38f6a9c3d548aa
Author: Christian Pfeiffer 
AuthorDate: Tue Mar 28 11:51:35 2017 +0200
Commit: Brad King 
CommitDate: Tue Mar 28 10:34:26 2017 -0400

VS: Fix OBJECT library support in Intel Fortran projects

The `TargetExt` for `.vfproj` object libraries should be `.lib`
to match the `OutputFile` value.  Otherwise Visual Fortran raises
warnings:

TargetPath(...) does not match the Library's OutputFile
property value (...)

diff --git a/Source/cmLocalVisualStudio7Generator.cxx 
b/Source/cmLocalVisualStudio7Generator.cxx
index 7c33821..3117ef3 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -746,11 +746,13 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(
 
   if (this->FortranProject) {
 // Intel Fortran >= 15.0 uses TargetName property.
-std::string targetNameFull = target->GetFullName(configName);
-std::string targetName =
+std::string const targetNameFull = target->GetFullName(configName);
+std::string const targetName =
   cmSystemTools::GetFilenameWithoutLastExtension(targetNameFull);
-std::string targetExt =
-  cmSystemTools::GetFilenameLastExtension(targetNameFull);
+std::string const targetExt =
+  target->GetType() == cmStateEnums::OBJECT_LIBRARY
+  ? ".lib"
+  : cmSystemTools::GetFilenameLastExtension(targetNameFull);
 /* clang-format off */
 fout <<
   "\t\t\tTargetName=\"" << this->EscapeForXML(targetName) << "\"\n"

---

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx |   10 ++
 1 file changed, 6 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.8.0-rc3-600-g3b32fdc

2017-03-28 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, next has been updated
  discards  645fc9b377931fb0df4360eb7a8dff2073394b6b (commit)
  discards  98486d17f2a925510c8bd3245942f1227c4fbe4c (commit)
   via  3b32fdc5d1530368b5b05d009f59bca79759d1c1 (commit)
   via  cdd2875ad2f1d5e0b0bc92ca1dff4f0c14d3424b (commit)
   via  e9c5505bf9c51c34dea703b86a293ff04475db54 (commit)
   via  cc4fbda1a9fffd8927de870643f167f066b26bcd (commit)
   via  3d3eacbb6115f39ba40f8c2fa48f9cf84ba210e9 (commit)
   via  83199f8daf13328a4fb97c16476c3a0da4228ead (commit)
   via  85abc5f5aa5f8afbca88e7b3e1c919db49756ecb (commit)
   via  8c94f5085d24bbc25f3f7fa421f7a62761a5515c (commit)
   via  3ed87b7ee1038f11e7d86988aca692c0773209b6 (commit)
   via  16cd8600683a0e144f31a2e2551013283458f231 (commit)
   via  2b350775d212835a39cf541bbb46aec0a7bf52cf (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (645fc9b377931fb0df4360eb7a8dff2073394b6b)
\
 N -- N -- N (3b32fdc5d1530368b5b05d009f59bca79759d1c1)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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=3b32fdc5d1530368b5b05d009f59bca79759d1c1
commit 3b32fdc5d1530368b5b05d009f59bca79759d1c1
Merge: cc4fbda cdd2875
Author: Brad King 
AuthorDate: Tue Mar 28 14:19:54 2017 +
Commit: Kitware Robot 
CommitDate: Tue Mar 28 10:19:56 2017 -0400

Stage topic 'update-kwsys'

Topic-id: 23322
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/637


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdd2875ad2f1d5e0b0bc92ca1dff4f0c14d3424b
commit cdd2875ad2f1d5e0b0bc92ca1dff4f0c14d3424b
Merge: cc4fbda e9c5505
Author: Brad King 
AuthorDate: Tue Mar 28 10:18:10 2017 -0400
Commit: Brad King 
CommitDate: Tue Mar 28 10:18:10 2017 -0400

Merge branch 'upstream-KWSys' into update-kwsys

* upstream-KWSys:
  KWSys 2017-03-28 (34999b6a)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9c5505bf9c51c34dea703b86a293ff04475db54
commit e9c5505bf9c51c34dea703b86a293ff04475db54
Author: KWSys Upstream 
AuthorDate: Tue Mar 28 09:49:59 2017 -0400
Commit: Brad King 
CommitDate: Tue Mar 28 10:18:09 2017 -0400

KWSys 2017-03-28 (34999b6a)

Code extracted from:

https://gitlab.kitware.com/utils/kwsys.git

at commit 34999b6ab815d1456818f4517338a15be7f89ea0 (master).

Upstream Shortlog
-

Daniel Pfeifer (1):
  6f43bcef FStream: Make (i|o)fstream::is_open function public

diff --git a/FStream.hxx.in b/FStream.hxx.in
index cf331a5..d4bc6c9 100644
--- a/FStream.hxx.in
+++ b/FStream.hxx.in
@@ -170,8 +170,6 @@ template  >
 class basic_ifstream : public std::basic_istream,
public basic_efilebuf
 {
-  using basic_efilebuf::is_open;
-
 public:
   typedef typename basic_efilebuf::internal_buffer_type
 internal_buffer_type;
@@ -201,6 +199,8 @@ public:
 
   void close() { this->_set_state(this->_close(), this, this); }
 
+  using basic_efilebuf::is_open;
+
   internal_buffer_type* rdbuf() const { return this->buf_; }
 
   ~basic_ifstream() @KWSYS_NAMESPACE@_FStream_NOEXCEPT { close(); }

---

Summary of changes:
 Source/kwsys/FStream.hxx.in |4 ++--
 1 file changed, 2 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, release, updated. v3.8.0-rc3-12-g85abc5f

2017-03-28 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, release has been updated
   via  85abc5f5aa5f8afbca88e7b3e1c919db49756ecb (commit)
   via  9dfccdc227f530997203ab9eb509a861f6718f59 (commit)
   via  8c94f5085d24bbc25f3f7fa421f7a62761a5515c (commit)
   via  92fe00d33cb029a583de20a16e5bc17bd337ed57 (commit)
   via  3ed87b7ee1038f11e7d86988aca692c0773209b6 (commit)
   via  6eb609fd59d989fede93fadfc67b928ee7ab7fc2 (commit)
   via  cf784d9ffeda82d6790c359b6d6ea7f88345 (commit)
   via  082c0375d9f21ada36bdd8fd710720e553bcdbbb (commit)
   via  16cd8600683a0e144f31a2e2551013283458f231 (commit)
   via  4ba065b22b544a509c76e497306b65e2dc0d5ee7 (commit)
   via  2b350775d212835a39cf541bbb46aec0a7bf52cf (commit)
   via  1e0fc685010d4b6c656c501908f812bf000251ed (commit)
  from  3b7f19a72ff2216b4613fdc8c5edf5d56e74d6fc (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 -
---

Summary of changes:
 Modules/CPackRPM.cmake |8 -
 Modules/InstallRequiredSystemLibraries.cmake   |   26 ++
 Source/cmCMakeHostSystemInformationCommand.cxx |   13 +++
 Source/cmNinjaNormalTargetGenerator.cxx|   14 +---
 .../RunCPackVerifyResult.cmake |8 ++---
 Tests/RunCMake/CPack/RPM/Helpers.cmake |4 +++
 .../CPack/tests/SOURCE_PACKAGE/VerifyResult.cmake  |4 ++-
 .../libarchive/archive_read_support_format_zip.c   |   36 +++-
 8 files changed, 72 insertions(+), 41 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.8.0-rc3-597-gcc4fbda

2017-03-28 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  cc4fbda1a9fffd8927de870643f167f066b26bcd (commit)
   via  3d3eacbb6115f39ba40f8c2fa48f9cf84ba210e9 (commit)
   via  85abc5f5aa5f8afbca88e7b3e1c919db49756ecb (commit)
   via  9dfccdc227f530997203ab9eb509a861f6718f59 (commit)
   via  8c94f5085d24bbc25f3f7fa421f7a62761a5515c (commit)
   via  3ed87b7ee1038f11e7d86988aca692c0773209b6 (commit)
   via  16cd8600683a0e144f31a2e2551013283458f231 (commit)
   via  2b350775d212835a39cf541bbb46aec0a7bf52cf (commit)
  from  83199f8daf13328a4fb97c16476c3a0da4228ead (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 -
---

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.8.0-rc3-589-g83199f8

2017-03-28 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  83199f8daf13328a4fb97c16476c3a0da4228ead (commit)
   via  4d970868489e7a7a45419ad7afe2ab8239ee (commit)
   via  92fe00d33cb029a583de20a16e5bc17bd337ed57 (commit)
   via  6eb609fd59d989fede93fadfc67b928ee7ab7fc2 (commit)
   via  cf784d9ffeda82d6790c359b6d6ea7f88345 (commit)
   via  082c0375d9f21ada36bdd8fd710720e553bcdbbb (commit)
  from  21499431e05b0defb134b10b1753488c0516bafd (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=83199f8daf13328a4fb97c16476c3a0da4228ead
commit 83199f8daf13328a4fb97c16476c3a0da4228ead
Merge: 4d97086 6eb609f
Author: Brad King 
AuthorDate: Tue Mar 28 14:14:46 2017 +
Commit: Kitware Robot 
CommitDate: Tue Mar 28 10:14:59 2017 -0400

Merge topic 'InstallRequiredSystemLibraries-vs2017'

6eb609fd InstallRequiredSystemLibraries: Find VS 2017 redist directory
cf784d9f Add undocumented CMake language means to find VS 2017
082c0375 InstallRequiredSystemLibraries: Split VS 2017 search paths

Acked-by: Kitware Robot 
Merge-request: !632


---

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake   |   26 +---
 Source/cmCMakeHostSystemInformationCommand.cxx |   13 
 Source/cmNinjaNormalTargetGenerator.cxx|   14 -
 3 files changed, 41 insertions(+), 12 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.8.0-rc3-591-g645fc9b

2017-03-28 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, next has been updated
  discards  23929b12ff818429786309261065d03c201a7b87 (commit)
  discards  ac6ccb2dadc50de4e1ec102a7165dd1ddf690122 (commit)
  discards  f751a822428ef07dc97487790efa5e2946c3c36e (commit)
   via  645fc9b377931fb0df4360eb7a8dff2073394b6b (commit)
   via  98486d17f2a925510c8bd3245942f1227c4fbe4c (commit)
   via  4d970868489e7a7a45419ad7afe2ab8239ee (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (23929b12ff818429786309261065d03c201a7b87)
\
 N -- N -- N (645fc9b377931fb0df4360eb7a8dff2073394b6b)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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=645fc9b377931fb0df4360eb7a8dff2073394b6b
commit 645fc9b377931fb0df4360eb7a8dff2073394b6b
Merge: 98486d1 9dfccdc
Author: Brad King 
AuthorDate: Mon Mar 27 20:55:08 2017 +
Commit: Kitware Robot 
CommitDate: Tue Mar 28 10:14:52 2017 -0400

Stage topic 'libarchive-backport-zip-dir-fix'

Topic-id: 23311
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/634


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98486d17f2a925510c8bd3245942f1227c4fbe4c
commit 98486d17f2a925510c8bd3245942f1227c4fbe4c
Merge: 4d97086 6eb609f
Author: Brad King 
AuthorDate: Mon Mar 27 17:46:54 2017 +
Commit: Kitware Robot 
CommitDate: Tue Mar 28 10:14:52 2017 -0400

Stage topic 'InstallRequiredSystemLibraries-vs2017'

Topic-id: 23302
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/632


---

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.8.0-rc3-613-gae2232a

[Cmake-commits] CMake branch, master, updated. v3.8.0-rc3-598-g3e4e659

[Cmake-commits] CMake branch, nightly, updated. v3.8.0-rc3-612-g896e195

[Cmake-commits] CMake branch, nightly-master, updated. v3.8.0-rc3-597-gcc4fbda

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc3-612-g896e195

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc3-610-g10a48e6

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc3-604-geb3978b

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc3-602-gbc35c1b

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc3-600-g3b32fdc

[Cmake-commits] CMake branch, release, updated. v3.8.0-rc3-12-g85abc5f

[Cmake-commits] CMake branch, master, updated. v3.8.0-rc3-597-gcc4fbda

[Cmake-commits] CMake branch, master, updated. v3.8.0-rc3-589-g83199f8

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc3-591-g645fc9b

13 matches

Site Navigation

Mail list logo

Footer information