[Cmake-commits] CMake branch, master, updated. v3.7.2-1146-gae629a0

2017-01-20 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  ae629a0dc9fa775230f4ce0157f13fde99381c9c (commit)
  from  6b4b8e6a600e177d6bbe41848e7de58e7392c81a (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=ae629a0dc9fa775230f4ce0157f13fde99381c9c
commit ae629a0dc9fa775230f4ce0157f13fde99381c9c
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Sat Jan 21 00:01:05 2017 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Sat Jan 21 00:01:05 2017 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 7990532..8329dec 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 7)
-set(CMake_VERSION_PATCH 20170120)
+set(CMake_VERSION_PATCH 20170121)
 #set(CMake_VERSION_RC 1)

---

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


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

[Cmake-commits] CMake branch, next, updated. v3.7.2-2276-gbb234a4

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  bb234a4b50ecca06c00ab4f4cebdd44261f25653 (commit)
   via  1ee0ffab819d632d7570bee23a83807facbb45a2 (commit)
   via  1806e011cb2608c7ef62f345661dd35a899eb81c (commit)
  from  1fe432a4a94ef20f8fad1b516a04541ba00e2610 (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=bb234a4b50ecca06c00ab4f4cebdd44261f25653
commit bb234a4b50ecca06c00ab4f4cebdd44261f25653
Merge: 1fe432a 1ee0ffa
Author: Brad King 
AuthorDate: Fri Jan 20 16:30:53 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 16:30:53 2017 -0500

Merge topic 'android-include-api' into next

1ee0ffab Android: Pass sysroot include directory explicitly
1806e011 Android: Fix c++_{static,shared} support include directory order


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ee0ffab819d632d7570bee23a83807facbb45a2
commit 1ee0ffab819d632d7570bee23a83807facbb45a2
Author: Brad King 
AuthorDate: Fri Jan 20 15:45:09 2017 -0500
Commit: Brad King 
CommitDate: Fri Jan 20 15:45:09 2017 -0500

Android: Pass sysroot include directory explicitly

The NDK's `build/core/definitions.mk` file adds compiler flags:

-isystem $$(call host-path,$$(SYSROOT_INC)/usr/include)

This passes the system include directory explicitly even though it is
implied by `--sysroot=`.  The explicit flag places the directory
earlier in the include path than the sysroot-default one would be.

Teach CMake to add this include directory at the end of the standard
include path for Android.  Otherwise the toolchain's `include-fixed/`
directory may replace system headers with "fixed" copies that are not
from the same API version.

Closes: #16536

diff --git a/Modules/Platform/Android-Common.cmake 
b/Modules/Platform/Android-Common.cmake
index 8755d4f..cf2785a 100644
--- a/Modules/Platform/Android-Common.cmake
+++ b/Modules/Platform/Android-Common.cmake
@@ -149,4 +149,13 @@ macro(__android_compiler_common lang)
   if("x${lang}" STREQUAL "xCXX")
 __android_stl(CXX)
   endif()
+
+  # /build/core/definitions.mk appends the sysroot's include directory
+  # explicitly at the end of the command-line include path so that it
+  # precedes the toolchain's builtin include directories.  This is
+  # necessary so that Android API-version-specific headers are preferred
+  # over those in the toolchain's `include-fixed` directory (which cannot
+  # possibly match all versions).
+  list(APPEND CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES 
"${CMAKE_SYSROOT}/usr/include")
+  list(REMOVE_ITEM CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES "/usr/include")
 endmacro()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1806e011cb2608c7ef62f345661dd35a899eb81c
commit 1806e011cb2608c7ef62f345661dd35a899eb81c
Author: Brad King 
AuthorDate: Fri Jan 20 15:39:27 2017 -0500
Commit: Brad King 
CommitDate: Fri Jan 20 15:39:27 2017 -0500

Android: Fix c++_{static,shared} support include directory order

The NDK's own build files:

/build/tools/build-cxx-stl.sh
/build/cmake/android.toolchain.cmake

for the `c++_static` and `c++_shared` build types add the
`/sources/android/support/include` include directory
between the two `/sources/cxx-stl/llvm-libc++*` directories.
Re-order our own include directory generation to match.

Issue: #16536

diff --git a/Modules/Platform/Android/ndk-stl-c++.cmake 
b/Modules/Platform/Android/ndk-stl-c++.cmake
index b27015d..a12411c 100644
--- a/Modules/Platform/Android/ndk-stl-c++.cmake
+++ b/Modules/Platform/Android/ndk-stl-c++.cmake
@@ -6,16 +6,15 @@ macro(__android_stl_cxx lang filename)
   if(EXISTS 
"${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx/include/cstddef")
 # r12 and below
 __android_stl_inc(${lang} 
"${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx/include" 1)
+__android_stl_inc(${lang} 
"${CMAKE_ANDROID_NDK}/sources/android/support/include" 0)
 __android_stl_inc(${lang} 
"${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++abi/libcxxabi/include" 1)
   else()
 # r13 and above
 __android_stl_inc(${lang} 
"${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/include" 1)
+__android_stl_inc(${lang} 
"${CMAKE_ANDROID_NDK}/sources/android/support/include" 0)
 __android_stl_inc(${lang} 
"${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++abi/include" 1)
   endif()
 
-  # Add a secondary include

[Cmake-commits] CMake branch, next, updated. v3.7.2-2273-g1fe432a

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  1fe432a4a94ef20f8fad1b516a04541ba00e2610 (commit)
   via  72c29b28286a37cde40e1b231d915f2b1fd249f8 (commit)
   via  28fe71051162e95fe5eb116c11cf36eacc3b1d7d (commit)
  from  b278af8e08066537fa4eab38b3001e1c0df9f8d8 (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=1fe432a4a94ef20f8fad1b516a04541ba00e2610
commit 1fe432a4a94ef20f8fad1b516a04541ba00e2610
Merge: b278af8 72c29b2
Author: Brad King 
AuthorDate: Fri Jan 20 15:50:10 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 15:50:10 2017 -0500

Merge topic 'sanitizer-options' into next

72c29b28 ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is 
empty
28fe7105 Tests: Use CTEST_MEMORYCHECK_SANITIZER_OPTIONS where appropriate


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72c29b28286a37cde40e1b231d915f2b1fd249f8
commit 72c29b28286a37cde40e1b231d915f2b1fd249f8
Author: Jamie Snape 
AuthorDate: Fri Jan 20 15:21:40 2017 -0500
Commit: Brad King 
CommitDate: Fri Jan 20 15:49:15 2017 -0500

ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx 
b/Source/CTest/cmCTestMemCheckHandler.cxx
index a062e64..beaef81 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -607,9 +607,13 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
   this->MemoryTesterDynamicOptions.push_back("-E");
   this->MemoryTesterDynamicOptions.push_back("env");
   std::string envVar;
-  std::string extraOptions = ":" +
-this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
+  std::string extraOptions;
   std::string suppressionsOption;
+  if (!this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions")
+ .empty()) {
+extraOptions = ":" +
+  this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
+  }
   if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile")
  .empty()) {
 suppressionsOption = ":suppressions=" +
@@ -632,7 +636,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
 envVar = "UBSAN_OPTIONS";
   }
   std::string outputFile =
-envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
+envVar + "=log_path=" + this->MemoryTesterOutputFile;
   this->MemoryTesterEnvironmentVariable =
 outputFile + suppressionsOption + extraOptions;
   break;
diff --git a/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake 
b/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
index 2a57b11..460d7cb 100644
--- a/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
@@ -2,7 +2,7 @@
 # options
 
 message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE 
"$ENV{ASAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE 
"$ENV{ASAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate AddressSanitizer don't do it
diff --git a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake 
b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
index 3082e4b..f14a773 100644
--- a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
@@ -2,7 +2,7 @@
 # options
 
 message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE 
"$ENV{ASAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE 
"$ENV{ASAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate address sanitizer don't do it
diff --git a/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake 
b/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
index af214c8..272130e 100644
--- a/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
@@ -2,7 +2,7 @@
 # options
 
 message("LSAN_OPTIONS = [$ENV{LSAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE 
"$ENV{LSAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE 
"$ENV{LSAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate LeakSanitizer don't do it
diff --git

[Cmake-commits] CMake branch, next, updated. v3.7.2-2270-gb278af8

2017-01-20 Thread 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  b278af8e08066537fa4eab38b3001e1c0df9f8d8 (commit)
   via  21de0cc48524e171b19df5f39eaf16543c34c2ae (commit)
  from  33fbedfbf2858051489c4d5d7cbc04f7cfb8d81e (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=b278af8e08066537fa4eab38b3001e1c0df9f8d8
commit b278af8e08066537fa4eab38b3001e1c0df9f8d8
Merge: 33fbedf 21de0cc
Author: Domen Vrankar 
AuthorDate: Fri Jan 20 14:45:09 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 14:45:09 2017 -0500

Merge topic 'cpack-stgz-minimal-test' into next

21de0cc4 fixup! CPack/STGZ: minimalistic packages test


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21de0cc48524e171b19df5f39eaf16543c34c2ae
commit 21de0cc48524e171b19df5f39eaf16543c34c2ae
Author: Domen Vrankar 
AuthorDate: Fri Jan 20 20:44:39 2017 +0100
Commit: Domen Vrankar 
CommitDate: Fri Jan 20 20:44:39 2017 +0100

fixup! CPack/STGZ: minimalistic packages test

diff --git a/Modules/CPack.STGZ_Header.sh.in b/Modules/CPack.STGZ_Header.sh.in
index dee576f..c615851 100755
--- a/Modules/CPack.STGZ_Header.sh.in
+++ b/Modules/CPack.STGZ_Header.sh.in
@@ -130,7 +130,10 @@ echo ""
 use_new_tail_syntax="-n"
 tail $use_new_tail_syntax +1 "$0" > /dev/null 2> /dev/null || 
use_new_tail_syntax=""
 
-tail $use_new_tail_syntax +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd 
"${toplevel}" && tar xf -) || cpack_echo_exit "Problem unpacking the 
@CPACK_PACKAGE_FILE_NAME@"
+extractor="pax -r"
+command -v pax > /dev/null 2> /dev/null || extractor="tar xf -"
+
+tail $use_new_tail_syntax +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd 
"${toplevel}" && ${extractor}) || cpack_echo_exit "Problem unpacking the 
@CPACK_PACKAGE_FILE_NAME@"
 
 echo "Unpacking finished successfully"
 
diff --git a/Tests/RunCMake/CPack/STGZ/Helpers.cmake 
b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
index 75036db..96be71b 100644
--- a/Tests/RunCMake/CPack/STGZ/Helpers.cmake
+++ b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
@@ -5,9 +5,22 @@ function(getPackageContent FILE RESULT_VAR)
   file(REMOVE_RECURSE "${path_}/content")
   file(MAKE_DIRECTORY "${path_}/content")
   execute_process(COMMAND ${FILE} --prefix=${path_}/content --include-subdir
-  ERROR_QUIET
+  RESULT_VARIABLE extract_result_
+  ERROR_VARIABLE extract_error_
   OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+  if(extract_result_)
+find_program(TAIL_EXECUTABLE tail)
+find_program(PAX_EXECUTABLE pax)
+find_program(GTAR_EXECUTABLE gtar)
+find_program(TAR_EXECUTABLE tar)
+find_program(GUNZIP_EXECUTABLE gunzip)
+
+message(FATAL_ERROR "Extracting STGZ archive failed: '${extract_error_}';"
+"'${TAIL_EXECUTABLE}'; '${PAX_EXECUTABLE}'; '${GTAR_EXECUTABLE}';"
+"'${TAR_EXECUTABLE}'; '${GUNZIP_EXECUTABLE}'")
+  endif()
+
   file(GLOB_RECURSE package_content_ LIST_DIRECTORIES true RELATIVE
   "${path_}/content" "${path_}/content/*")
 

---

Summary of changes:
 Modules/CPack.STGZ_Header.sh.in |5 -
 Tests/RunCMake/CPack/STGZ/Helpers.cmake |   15 ++-
 2 files changed, 18 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.7.2-2268-g33fbedf

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  33fbedfbf2858051489c4d5d7cbc04f7cfb8d81e (commit)
   via  64aeddeb1274793b8f3ec2a1369398620ebd5ef0 (commit)
  from  b65393034d79702fcb5b97a8ac1bb2abb7065553 (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=33fbedfbf2858051489c4d5d7cbc04f7cfb8d81e
commit 33fbedfbf2858051489c4d5d7cbc04f7cfb8d81e
Merge: b653930 64aedde
Author: Brad King 
AuthorDate: Fri Jan 20 14:18:05 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 14:18:05 2017 -0500

Merge topic 'sanitizer-options' into next

64aeddeb Revert "ctest_memcheck: Fix sanitizers when 
MemoryCheckSanitizerOptions is empty"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64aeddeb1274793b8f3ec2a1369398620ebd5ef0
commit 64aeddeb1274793b8f3ec2a1369398620ebd5ef0
Author: Brad King 
AuthorDate: Fri Jan 20 14:17:46 2017 -0500
Commit: Brad King 
CommitDate: Fri Jan 20 14:17:46 2017 -0500

Revert "ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is 
empty"

This reverts commit 5a2d9200aa246b25dfa66a2c4cafe82f6c6c51fc.

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx 
b/Source/CTest/cmCTestMemCheckHandler.cxx
index beaef81..a062e64 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -607,13 +607,9 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
   this->MemoryTesterDynamicOptions.push_back("-E");
   this->MemoryTesterDynamicOptions.push_back("env");
   std::string envVar;
-  std::string extraOptions;
+  std::string extraOptions = ":" +
+this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
   std::string suppressionsOption;
-  if (!this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions")
- .empty()) {
-extraOptions = ":" +
-  this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
-  }
   if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile")
  .empty()) {
 suppressionsOption = ":suppressions=" +
@@ -636,7 +632,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
 envVar = "UBSAN_OPTIONS";
   }
   std::string outputFile =
-envVar + "=log_path=" + this->MemoryTesterOutputFile;
+envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
   this->MemoryTesterEnvironmentVariable =
 outputFile + suppressionsOption + extraOptions;
   break;

---

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.7.2-2266-gb653930

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  b65393034d79702fcb5b97a8ac1bb2abb7065553 (commit)
   via  10c9c73d58b481a212d1ed87ceeb227a7654bc56 (commit)
  from  de9eee5f4cc05ef6dc161044d68b7400c60e2772 (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=b65393034d79702fcb5b97a8ac1bb2abb7065553
commit b65393034d79702fcb5b97a8ac1bb2abb7065553
Merge: de9eee5 10c9c73
Author: Brad King 
AuthorDate: Fri Jan 20 13:56:22 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 13:56:22 2017 -0500

Merge topic '16253-xcode-effective-platform-name' into next

10c9c73d Xcode: Control emission of EFFECTIVE_PLATFORM_NAME


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10c9c73d58b481a212d1ed87ceeb227a7654bc56
commit 10c9c73d58b481a212d1ed87ceeb227a7654bc56
Author: Gregor Jasny 
AuthorDate: Sun Jan 15 23:23:31 2017 +0100
Commit: Brad King 
CommitDate: Fri Jan 20 13:51:48 2017 -0500

Xcode: Control emission of EFFECTIVE_PLATFORM_NAME

When building with multiple SDKs within one project Xcode requires
the usage of ${EFFECTIVE_PLATFORM_NAME} to put temporary and build
outout into separate directories. For example an iOS device and
simulator build use two different SDKs (iphoneos and iphonesimulator).

In the past cmake tries to detect embedded toolchains that could
possibly use simulators and emitted EFFECTIVE_PLATFORM_NAME (EPN)
at the proper locations. In #16253 Mark noticed that if he
uses macosx and iphoneos in combination the necessary EPN is not
emitted. This is because CMake by default assumes macosx SDK which
does not trigger EPN emission.

The fist naive approach - enabling EPN unconditionally revealed that
then the EPN leaks into generator expressions like $
which might be a regression and thus is unacceptable.

The next approach was to add an CMake property to enable EPN emission
unconditionally. This solved the reported problem.

But the EPN leakage also happened for the embedded toolchains already
without anyone noticing. So the control property was turned into a
tri-state one:

 * No definition: EPN is activated for embedded toolchains like before
 * ON: EPN is always emitted
 * OFF: EPN is never emitted

That approach gives the user the chance to disable EPN for embedded
toolchains and restores generator expression functionality for those.

Closes: #16253

diff --git a/Help/manual/cmake-properties.7.rst 
b/Help/manual/cmake-properties.7.rst
index 864d1dc..2ff84dd 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -44,6 +44,7 @@ Properties of Global Scope
/prop_gbl/TARGET_MESSAGES
/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS
/prop_gbl/USE_FOLDERS
+   /prop_gbl/XCODE_EMIT_EFFECTIVE_PLATFORM_NAME
 
 .. _`Directory Properties`:
 
diff --git a/Help/prop_gbl/XCODE_EMIT_EFFECTIVE_PLATFORM_NAME.rst 
b/Help/prop_gbl/XCODE_EMIT_EFFECTIVE_PLATFORM_NAME.rst
new file mode 100644
index 000..9a6086e
--- /dev/null
+++ b/Help/prop_gbl/XCODE_EMIT_EFFECTIVE_PLATFORM_NAME.rst
@@ -0,0 +1,24 @@
+XCODE_EMIT_EFFECTIVE_PLATFORM_NAME
+--
+
+Control emission of ``EFFECTIVE_PLATFORM_NAME`` by the Xcode generator.
+
+It is required for building the same target with multiple SDKs. A
+common use case is the parallel use of ``iphoneos`` and
+``iphonesimulator`` SDKs.
+
+Three different states possible that control when the Xcode generator
+emits the ``EFFECTIVE_PLATFORM_NAME`` variable:
+
+- If set to ``ON`` it will always be emitted
+- If set to ``OFF`` it will never be emitted
+- If unset (the default) it will only be emitted when the project was
+  configured for an embedded Xcode SDK like iOS, tvOS, watchOS or any
+  of the simulators.
+
+.. note::
+
+  When this behavior is enable for generated Xcode projects, the
+  ``EFFECTIVE_PLATFORM_NAME`` variable will leak into
+  :manual:`Generator expressions `
+  like ``TARGET_FILE`` and will render those mostly unusable.
diff --git a/Help/release/dev/xcode-effective-platform-name.rst 
b/Help/release/dev/xcode-effective-platform-name.rst
new file mode 100644
index 000..e337ca0
--- /dev/null
+++ b/Help/release/dev/xcode-effective-platform-name.rst
@@ -0,0 +1,8 @@
+xcode-effective-platform-name
+-
+
+* The Xcode generator can now control emission of the
+  ``EFFECTIVE_PLATFORM_NAME``

[Cmake-commits] CMake branch, next, updated. v3.7.2-2264-gde9eee5

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  de9eee5f4cc05ef6dc161044d68b7400c60e2772 (commit)
   via  5a2d9200aa246b25dfa66a2c4cafe82f6c6c51fc (commit)
  from  b92afa6fb2d19eb8006bd2893f179953644b5439 (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=de9eee5f4cc05ef6dc161044d68b7400c60e2772
commit de9eee5f4cc05ef6dc161044d68b7400c60e2772
Merge: b92afa6 5a2d920
Author: Brad King 
AuthorDate: Fri Jan 20 13:44:17 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 13:44:17 2017 -0500

Merge topic 'sanitizer-options' into next

5a2d9200 ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is 
empty


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a2d9200aa246b25dfa66a2c4cafe82f6c6c51fc
commit 5a2d9200aa246b25dfa66a2c4cafe82f6c6c51fc
Author: Jamie Snape 
AuthorDate: Thu Jan 19 15:14:43 2017 -0500
Commit: Jamie Snape 
CommitDate: Thu Jan 19 15:14:43 2017 -0500

ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx 
b/Source/CTest/cmCTestMemCheckHandler.cxx
index a062e64..beaef81 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -607,9 +607,13 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
   this->MemoryTesterDynamicOptions.push_back("-E");
   this->MemoryTesterDynamicOptions.push_back("env");
   std::string envVar;
-  std::string extraOptions = ":" +
-this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
+  std::string extraOptions;
   std::string suppressionsOption;
+  if (!this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions")
+ .empty()) {
+extraOptions = ":" +
+  this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
+  }
   if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile")
  .empty()) {
 suppressionsOption = ":suppressions=" +
@@ -632,7 +636,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
 envVar = "UBSAN_OPTIONS";
   }
   std::string outputFile =
-envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
+envVar + "=log_path=" + this->MemoryTesterOutputFile;
   this->MemoryTesterEnvironmentVariable =
 outputFile + suppressionsOption + extraOptions;
   break;

---

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx |   10 +++---
 1 file changed, 7 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.7.2-2262-gb92afa6

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  b92afa6fb2d19eb8006bd2893f179953644b5439 (commit)
   via  4bfb1249ede1b86dcd53b34ec885f17460edc8f6 (commit)
   via  90cb40832375fa880b792ca9bf5cdd3071912f9d (commit)
  from  52edbfcac86c6156e95cbdb1947e71216e8b8a40 (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=b92afa6fb2d19eb8006bd2893f179953644b5439
commit b92afa6fb2d19eb8006bd2893f179953644b5439
Merge: 52edbfc 4bfb124
Author: Brad King 
AuthorDate: Fri Jan 20 13:40:50 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 13:40:50 2017 -0500

Merge topic 'csproj-improvements' into next

4bfb1249 VS: removed usage of relative paths for C# targets in in-source 
builds
90cb4083 VS: improve handling of source files with special extensions in 
.csproj


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bfb1249ede1b86dcd53b34ec885f17460edc8f6
commit 4bfb1249ede1b86dcd53b34ec885f17460edc8f6
Author: Michael Stürmer 
AuthorDate: Wed Jan 18 15:53:40 2017 +0100
Commit: Michael Stürmer 
CommitDate: Wed Jan 18 15:53:40 2017 +0100

VS: removed usage of relative paths for C# targets in in-source builds

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx 
b/Source/cmVisualStudio10TargetGenerator.cxx
index 138ac2b..2e6c19b 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1671,12 +1671,6 @@ void 
cmVisualStudio10TargetGenerator::WriteSource(std::string const& tool,
   this->GlobalGenerator->PathTooLong(this->GeneratorTarget, sf, sourceRel);
 }
   }
-  if (csproj == this->ProjectType && this->InSourceBuild) {
-std::string srcdir = this->Makefile->GetCurrentSourceDirectory();
-if (sourceFile.find(srcdir) != std::string::npos) {
-  sourceFile = sourceFile.substr(srcdir.size() + 1);
-}
-  }
   this->ConvertToWindowsSlash(sourceFile);
   this->WriteString("<", 2);
   (*this->BuildFileStream) << tool << " Include=\""

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90cb40832375fa880b792ca9bf5cdd3071912f9d
commit 90cb40832375fa880b792ca9bf5cdd3071912f9d
Author: Michael Stürmer 
AuthorDate: Tue Jan 17 16:09:38 2017 +0100
Commit: Michael Stürmer 
CommitDate: Wed Jan 18 15:51:22 2017 +0100

VS: improve handling of source files with special extensions in .csproj

Mainly  and  tags are added to connect generated
and manually edited files. Special file extensions that are take care
of are:

 - .Designer.cs
 - .xaml.cs
 - .settings
 - .resx
 - .xaml

diff --git a/Help/manual/cmake-properties.7.rst 
b/Help/manual/cmake-properties.7.rst
index 864d1dc..03178a1 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -362,8 +362,11 @@ Properties on Source Files
/prop_sf/SKIP_AUTORCC
/prop_sf/SKIP_AUTOUIC
/prop_sf/SYMBOLIC
+   /prop_sf/VS_COPY_TO_OUT_DIR
/prop_sf/VS_DEPLOYMENT_CONTENT
/prop_sf/VS_DEPLOYMENT_LOCATION
+   /prop_sf/VS_INCLUDE_IN_VSIX
+   /prop_sf/VS_RESOURCE_GENERATOR
/prop_sf/VS_SHADER_ENTRYPOINT
/prop_sf/VS_SHADER_FLAGS
/prop_sf/VS_SHADER_MODEL
diff --git a/Help/prop_sf/VS_COPY_TO_OUT_DIR.rst 
b/Help/prop_sf/VS_COPY_TO_OUT_DIR.rst
new file mode 100644
index 000..16c8d83
--- /dev/null
+++ b/Help/prop_sf/VS_COPY_TO_OUT_DIR.rst
@@ -0,0 +1,6 @@
+VS_COPY_TO_OUT_DIR
+--
+
+Sets the  tag for a source file in a
+Visual Studio project file. Valid values are ``Never``, ``Always``
+and ``PreserveNewest``.
diff --git a/Help/prop_sf/VS_INCLUDE_IN_VSIX.rst 
b/Help/prop_sf/VS_INCLUDE_IN_VSIX.rst
new file mode 100644
index 000..30f471d
--- /dev/null
+++ b/Help/prop_sf/VS_INCLUDE_IN_VSIX.rst
@@ -0,0 +1,6 @@
+VS_INCLUDE_IN_VSIX
+--
+
+Boolean property to specify if the file should be included within a VSIX
+extension package. This is needed for development of Visual Studio
+extensions.
diff --git a/Help/prop_sf/VS_RESOURCE_GENERATOR.rst 
b/Help/prop_sf/VS_RESOURCE_GENERATOR.rst
new file mode 100644
index 000..97e5aac
--- /dev/null
+++ b/Help/prop_sf/VS_RESOURCE_GENERATOR.rst
@@ -0,0 +1,8 @@
+VS_RESOURCE_GENERATOR
+-
+
+This property allows to specify the resource generator to be used
+on this file. It defaults to ``PublicResXFileCodeGenerator`` if
+not set.
+
+This property only applies to C# projects.
diff --git

[Cmake-commits] CMake branch, next, updated. v3.7.2-2259-g52edbfc

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  52edbfcac86c6156e95cbdb1947e71216e8b8a40 (commit)
   via  211bd24ab3388d44d018f0e4773f9db80c9eb9e0 (commit)
  from  7f6d4227d57b9e5deb0aae0e1caee7ff86b7533b (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=52edbfcac86c6156e95cbdb1947e71216e8b8a40
commit 52edbfcac86c6156e95cbdb1947e71216e8b8a40
Merge: 7f6d422 211bd24
Author: Brad King 
AuthorDate: Fri Jan 20 13:33:45 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 13:33:45 2017 -0500

Merge topic 'lang_lint' into next

211bd24a Add properties to run the cpplint style checker with the compiler


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=211bd24ab3388d44d018f0e4773f9db80c9eb9e0
commit 211bd24ab3388d44d018f0e4773f9db80c9eb9e0
Author: Jamie Snape 
AuthorDate: Tue Jan 17 18:26:07 2017 -0500
Commit: Jamie Snape 
CommitDate: Tue Jan 17 18:26:07 2017 -0500

Add properties to run the cpplint style checker with the compiler

Create a `_CPPLINT` target property (initialized by a
`CMAKE__CPPLINT` variable) to specify a `cpplint` style checker
command line to be run along with the compiler.

diff --git a/Auxiliary/vim/syntax/cmake.vim b/Auxiliary/vim/syntax/cmake.vim
index fabf9c1..1f19cb7 100644
--- a/Auxiliary/vim/syntax/cmake.vim
+++ b/Auxiliary/vim/syntax/cmake.vim
@@ -32,11 +32,11 @@ syn region cmakeArguments start=/(/ end=/)/
 
 syn case match
 syn keyword cmakeProperty
-\ ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ADVANCED ALIASED_TARGET 
ALLOW_DUPLICATE_CUSTOM_TARGETS ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API 
ANDROID_API_MIN ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_GUI 
ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR 
ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES 
ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH 
ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE 
ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_DEBUG 
ARCHIVE_OUTPUT_DIRECTORY_RELEASE ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_DEBUG 
ARCHIVE_OUTPUT_NAME_RELEASE ATTACHED_FILES ATTACHED_FILES_ON_FAIL 
AUTOGEN_TARGETS_FOLDER AUTOGEN_TARGET_DEPENDS AUTOMOC AUTOMOC_MOC_OPTIONS 
AUTOMOC_TARGETS_FOLDER AUTORCC AUTORCC_OPTIONS AUTOUIC AUTOUIC_OPTIONS 
BINARY_DIR BUILD_WITH_INSTALL_RPATH BUNDLE BUNDLE_EXTENSION CACHE_VARIABLES 
CLEAN_NO_CUSTOM CMAKE_CONFIGURE_DEPENDS CMAKE_CXX_KNOWN_FEATURES 
CMAKE_C_KNOWN_FEATURES COM
 PATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX 
COMPATIBLE_INTERFACE_NUMBER_MIN COMPATIBLE_INTERFACE_STRING COMPILE_DEFINITIONS 
COMPILE_DEFINITIONS_DEBUG COMPILE_DEFINITIONS_RELEASE COMPILE_FEATURES 
COMPILE_FLAGS COMPILE_OPTIONS COMPILE_PDB_NAME COMPILE_PDB_NAME_DEBUG 
COMPILE_PDB_NAME_RELEASE COMPILE_PDB_OUTPUT_DIRECTORY 
COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE COST 
CPACK_DESKTOP_SHORTCUTS CPACK_NEVER_OVERWRITE CPACK_PERMANENT 
CPACK_STARTUP_SHORTCUTS CPACK_START_MENU_SHORTCUTS CPACK_WIX_ACL 
CROSSCOMPILING_EMULATOR CXX_EXTENSIONS CXX_STANDARD CXX_STANDARD_REQUIRED 
C_EXTENSIONS C_STANDARD C_STANDARD_REQUIRED DEBUG_CONFIGURATIONS DEBUG_POSTFIX 
DEFINE_SYMBOL DEFINITIONS DEPENDS DISABLED_FEATURES ECLIPSE_EXTRA_NATURES 
ENABLED_FEATURES ENABLED_LANGUAGES ENABLE_EXPORTS ENVIRONMENT EXCLUDE_FROM_ALL 
EXCLUDE_FROM_DEFAULT_BUILD EXCLUDE_FROM_DEFAULT_BUILD_DEBUG 
EXCLUDE_FROM_DEFAULT_BUILD_RELEASE EXPORT_NAME EXTERNAL_OBJECT EchoString 
FAIL_REGULAR_EXPRESSION
  FIND_LIBRARY_USE_LIB64_PATHS FIND_LIBRARY_USE_OPENBSD_VERSIONING FOLDER 
FRAMEWORK FRAMEWORK_VERSION Fortran_FORMAT Fortran_MODULE_DIRECTORY GENERATED 
GENERATOR_FILE_NAME GLOBAL_DEPENDS_DEBUG_MODE GLOBAL_DEPENDS_NO_CYCLES GNUtoMS 
HAS_CXX HEADER_FILE_ONLY HELPSTRING IMPLICIT_DEPENDS_INCLUDE_TRANSFORM IMPORTED 
IMPORTED_CONFIGURATIONS IMPORTED_IMPLIB IMPORTED_IMPLIB_DEBUG 
IMPORTED_IMPLIB_RELEASE IMPORTED_LINK_DEPENDENT_LIBRARIES 
IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUG 
IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_LANGUAGES 
IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG 
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE IMPORTED_LINK_INTERFACE_LIBRARIES 
IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG 
IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_MULTIPLICITY 
IMPORTED_LINK_INTERFACE_MULTIPLICITY_DEBUG 
IMPORTED_LINK_INTERFACE_MULTIPLICITY_RELEASE IMPORTED_LOCATION 
IMPORTED_LOCATION_DEBUG IMPORTED_LOCATION_RELEASE IMPORTED_NO_SONAME 
IMPORTED_NO_SONAME_DEBUG

[Cmake-commits] CMake branch, next, updated. v3.7.2-2257-g7f6d422

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  7f6d4227d57b9e5deb0aae0e1caee7ff86b7533b (commit)
   via  8f1bce12d2f8ae2eb3771b173b28b8405b059923 (commit)
  from  e0cee4632ec08a8eb2f73b33b2a702b3add0fc33 (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=7f6d4227d57b9e5deb0aae0e1caee7ff86b7533b
commit 7f6d4227d57b9e5deb0aae0e1caee7ff86b7533b
Merge: e0cee46 8f1bce1
Author: Brad King 
AuthorDate: Fri Jan 20 13:31:43 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 13:31:43 2017 -0500

Merge topic 'qtdialog-trim-new-varname' into next

8f1bce12 cmake-gui: trim spaces from user-created variable names


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f1bce12d2f8ae2eb3771b173b28b8405b059923
commit 8f1bce12d2f8ae2eb3771b173b28b8405b059923
Author: Clinton Stimpson 
AuthorDate: Tue Jan 17 19:56:21 2017 -0700
Commit: Brad King 
CommitDate: Fri Jan 20 13:31:09 2017 -0500

cmake-gui: trim spaces from user-created variable names

Fixes: #15955

diff --git a/Source/QtDialog/AddCacheEntry.cxx 
b/Source/QtDialog/AddCacheEntry.cxx
index daf4bd1..6284ac9 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/Source/QtDialog/AddCacheEntry.cxx
@@ -46,7 +46,7 @@ AddCacheEntry::AddCacheEntry(QWidget* p, const QStringList& 
varNames,
 
 QString AddCacheEntry::name() const
 {
-  return this->Name->text();
+  return this->Name->text().trimmed();
 }
 
 QVariant AddCacheEntry::value() const

---

Summary of changes:
 Source/QtDialog/AddCacheEntry.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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

[Cmake-commits] CMake branch, next, updated. v3.7.2-2255-ge0cee46

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  e0cee4632ec08a8eb2f73b33b2a702b3add0fc33 (commit)
   via  1c2ac0b8baebcf2496d701ab316f8f5666b470be (commit)
  from  da9be2c4764f2557e4a7b44a11ce6cb8412a100e (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=e0cee4632ec08a8eb2f73b33b2a702b3add0fc33
commit e0cee4632ec08a8eb2f73b33b2a702b3add0fc33
Merge: da9be2c 1c2ac0b
Author: Brad King 
AuthorDate: Fri Jan 20 13:29:03 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 13:29:03 2017 -0500

Merge topic 'qt4-lupdate-cmp0058' into next

1c2ac0b8 Qt4: Only change timestamp on generated .pro files if content 
changes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c2ac0b8baebcf2496d701ab316f8f5666b470be
commit 1c2ac0b8baebcf2496d701ab316f8f5666b470be
Author: Clinton Stimpson 
AuthorDate: Tue Jan 17 07:57:09 2017 -0700
Commit: Brad King 
CommitDate: Fri Jan 20 13:28:48 2017 -0500

Qt4: Only change timestamp on generated .pro files if content changes

In qt4_create_translation() use file(GENERATE ...) instead of
file(WRITE ...).  This also removes a possible CMP0058 warning
because file(GENERATE) tells the Ninja generator about the files
it provides.

Fixes: #16518

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 0279d1c..0478918 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -439,7 +439,7 @@ macro(QT4_CREATE_TRANSLATION _qm_files)
  get_filename_component(_abs_include "${_pro_include}" ABSOLUTE)
  string(APPEND _pro_includes " \\\n  \"${_abs_include}\"")
endforeach()
-   file(WRITE ${_ts_pro} "SOURCES =${_pro_srcs}\nINCLUDEPATH 
=${_pro_includes}\n")
+   file(GENERATE OUTPUT ${_ts_pro} CONTENT "SOURCES 
=${_pro_srcs}\nINCLUDEPATH =${_pro_includes}\n")
  endif()
  add_custom_command(OUTPUT ${_ts_file}
 COMMAND Qt4::lupdate

---

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.7.2-2253-gda9be2c

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  da9be2c4764f2557e4a7b44a11ce6cb8412a100e (commit)
   via  54963f7c1c30622a4d4ca7afb3bd3c2d44257754 (commit)
  from  fa8f3ada662e9cbf3f92e9b60989dd25d623b23a (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=da9be2c4764f2557e4a7b44a11ce6cb8412a100e
commit da9be2c4764f2557e4a7b44a11ce6cb8412a100e
Merge: fa8f3ad 54963f7
Author: Brad King 
AuthorDate: Fri Jan 20 13:28:15 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 13:28:15 2017 -0500

Merge topic 'qt4-lupdate-cmp0058' into next

54963f7c Qt4: Only change timestamp on generated .pro files if content 
changes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54963f7c1c30622a4d4ca7afb3bd3c2d44257754
commit 54963f7c1c30622a4d4ca7afb3bd3c2d44257754
Author: Clinton Stimpson 
AuthorDate: Tue Jan 17 07:57:09 2017 -0700
Commit: Brad King 
CommitDate: Fri Jan 20 13:27:35 2017 -0500

Qt4: Only change timestamp on generated .pro files if content changes

In qt4_create_translation() use file(GENERATE ...) instead of
file(WRITE ...).  This also removes a possible CMP0058 warning
because file(GENERATE) tells the Ninja generator about the files
it provides.

Fixes: #16518.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 0279d1c..0478918 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -439,7 +439,7 @@ macro(QT4_CREATE_TRANSLATION _qm_files)
  get_filename_component(_abs_include "${_pro_include}" ABSOLUTE)
  string(APPEND _pro_includes " \\\n  \"${_abs_include}\"")
endforeach()
-   file(WRITE ${_ts_pro} "SOURCES =${_pro_srcs}\nINCLUDEPATH 
=${_pro_includes}\n")
+   file(GENERATE OUTPUT ${_ts_pro} CONTENT "SOURCES 
=${_pro_srcs}\nINCLUDEPATH =${_pro_includes}\n")
  endif()
  add_custom_command(OUTPUT ${_ts_file}
 COMMAND Qt4::lupdate

---

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


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

[Cmake-commits] CMake branch, next, updated. v3.7.2-2251-gfa8f3ad

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  fa8f3ada662e9cbf3f92e9b60989dd25d623b23a (commit)
   via  6b4b8e6a600e177d6bbe41848e7de58e7392c81a (commit)
   via  d9d41d332d91abf0da7aa531b64bdecad5b6e9b9 (commit)
   via  0f891007a902a79acf746479f6bfe19b96899cef (commit)
   via  395f01ef728b3c41b2cab020aff381814244ebe1 (commit)
   via  910ef6d0a3eab5d483759ee23f10e91f1c4da8c2 (commit)
   via  22d240184cfe5afda325551b68610bf7160afa8b (commit)
   via  45dea920ab4e96f84f43eab906dca3c51bd12c31 (commit)
  from  a2ee4ce131ae24160c9825aa67f7f38e7eef48ad (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=fa8f3ada662e9cbf3f92e9b60989dd25d623b23a
commit fa8f3ada662e9cbf3f92e9b60989dd25d623b23a
Merge: a2ee4ce 6b4b8e6
Author: Brad King 
AuthorDate: Fri Jan 20 11:55:01 2017 -0500
Commit: Brad King 
CommitDate: Fri Jan 20 11:55:01 2017 -0500

Merge branch 'master' into next


---

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


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

[Cmake-commits] CMake branch, master, updated. v3.7.2-1135-g22d2401

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  22d240184cfe5afda325551b68610bf7160afa8b (commit)
   via  05ed82b1d2175410e8cf4d7f8b4b7ba0514d2589 (commit)
   via  0ce7643a84eabfc1c1083d2f3ecccfae6d04836a (commit)
   via  5614a5cd1f7f8fe34f6b31c572476a2ddfd6d9ae (commit)
  from  45dea920ab4e96f84f43eab906dca3c51bd12c31 (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=22d240184cfe5afda325551b68610bf7160afa8b
commit 22d240184cfe5afda325551b68610bf7160afa8b
Merge: 45dea92 05ed82b
Author: Brad King 
AuthorDate: Fri Jan 20 11:54:28 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 11:54:28 2017 -0500

Merge topic 'cdash_upload_retry'

05ed82b1 ctest_submit: Update documentation for CDash upload retries
0ce7643a ctest_submit: improve handling of QUIET option
5614a5cd ctest_submit: Allow RETRY_COUNT for CDASH_UPLOAD


---

Summary of changes:
 Help/command/ctest_submit.rst  |8 +-
 Help/release/dev/cdash_upload_retry.rst|5 +
 Source/CTest/cmCTestCurl.cxx   |   38 ---
 Source/CTest/cmCTestCurl.h |2 +
 Source/CTest/cmCTestSubmitCommand.cxx  |   29 ++---
 Source/CTest/cmCTestSubmitHandler.cxx  |  118 +---
 ...esult.txt => CDashUploadMissingFile-result.txt} |0
 .../ctest_submit/CDashUploadMissingFile-stderr.txt |1 +
 .../ctest_submit/CDashUploadRETRY_COUNT-stderr.txt |2 -
 .../ctest_submit/CDashUploadRETRY_DELAY-stderr.txt |2 -
 ...ELAY-result.txt => CDashUploadRetry-result.txt} |0
 .../ctest_submit/CDashUploadRetry-stderr.txt   |1 +
 .../ctest_submit/CDashUploadRetry-stdout.txt   |4 +
 Tests/RunCMake/ctest_submit/RunCMakeTest.cmake |4 +-
 14 files changed, 162 insertions(+), 52 deletions(-)
 create mode 100644 Help/release/dev/cdash_upload_retry.rst
 rename Tests/RunCMake/ctest_submit/{CDashUploadRETRY_COUNT-result.txt => 
CDashUploadMissingFile-result.txt} (100%)
 create mode 100644 
Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt
 delete mode 100644 
Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
 delete mode 100644 
Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
 rename Tests/RunCMake/ctest_submit/{CDashUploadRETRY_DELAY-result.txt => 
CDashUploadRetry-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.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.7.2-1143-gd9d41d3

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  d9d41d332d91abf0da7aa531b64bdecad5b6e9b9 (commit)
   via  0ed885f742088b0e68103b87ee36837c37575628 (commit)
  from  0f891007a902a79acf746479f6bfe19b96899cef (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=d9d41d332d91abf0da7aa531b64bdecad5b6e9b9
commit d9d41d332d91abf0da7aa531b64bdecad5b6e9b9
Merge: 0f89100 0ed885f
Author: Brad King 
AuthorDate: Fri Jan 20 11:54:39 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 11:54:39 2017 -0500

Merge topic 'ExternalProject-restore-case-insensitive-hash'

0ed885f7 ExternalProject: Restore case-insensitive download hash check


---

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


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

[Cmake-commits] CMake branch, master, updated. v3.7.2-1145-g6b4b8e6

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  6b4b8e6a600e177d6bbe41848e7de58e7392c81a (commit)
   via  adc04afe34791a90a552fcaefaf30e24b937e1b3 (commit)
  from  d9d41d332d91abf0da7aa531b64bdecad5b6e9b9 (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=6b4b8e6a600e177d6bbe41848e7de58e7392c81a
commit 6b4b8e6a600e177d6bbe41848e7de58e7392c81a
Merge: d9d41d3 adc04af
Author: Brad King 
AuthorDate: Fri Jan 20 11:54:41 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 11:54:41 2017 -0500

Merge topic 'add-dl-to-lua-static-linking'

adc04afe FindLua: Add dl library to Lua static library linking


---

Summary of changes:
 Modules/FindLua.cmake |7 +++
 1 file changed, 7 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, master, updated. v3.7.2-1137-g910ef6d

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  910ef6d0a3eab5d483759ee23f10e91f1c4da8c2 (commit)
   via  d9f836e9567dbcce85b917300e8de9086aa1f1f7 (commit)
  from  22d240184cfe5afda325551b68610bf7160afa8b (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=910ef6d0a3eab5d483759ee23f10e91f1c4da8c2
commit 910ef6d0a3eab5d483759ee23f10e91f1c4da8c2
Merge: 22d2401 d9f836e
Author: Brad King 
AuthorDate: Fri Jan 20 11:54:31 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 11:54:31 2017 -0500

Merge topic '16165-manually-added-dependencies'

d9f836e9 Add a getter for manually added target dependencies


---

Summary of changes:
 Help/manual/cmake-properties.7.rst|1 +
 Help/prop_tgt/MANUALLY_ADDED_DEPENDENCIES.rst |8 
 Help/release/dev/manually-added-dependencies.rst  |6 ++
 Source/cmTarget.cxx   |   17 +
 .../ReadOnlyProperty-result.txt}  |0
 .../add_dependencies/ReadOnlyProperty-stderr.txt  |1 +
 .../RunCMake/add_dependencies/ReadOnlyProperty.cmake  |6 ++
 .../add_dependencies/RetrieveDependencies.cmake   |   16 
 Tests/RunCMake/add_dependencies/RunCMakeTest.cmake|2 ++
 Tests/RunCMake/add_dependencies/a.c   |3 +++
 Tests/RunCMake/add_dependencies/b.c   |3 +++
 Tests/RunCMake/add_dependencies/c.c   |3 +++
 12 files changed, 66 insertions(+)
 create mode 100644 Help/prop_tgt/MANUALLY_ADDED_DEPENDENCIES.rst
 create mode 100644 Help/release/dev/manually-added-dependencies.rst
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => 
add_dependencies/ReadOnlyProperty-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_dependencies/ReadOnlyProperty-stderr.txt
 create mode 100644 Tests/RunCMake/add_dependencies/ReadOnlyProperty.cmake
 create mode 100644 Tests/RunCMake/add_dependencies/RetrieveDependencies.cmake
 create mode 100644 Tests/RunCMake/add_dependencies/a.c
 create mode 100644 Tests/RunCMake/add_dependencies/b.c
 create mode 100644 Tests/RunCMake/add_dependencies/c.c


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

[Cmake-commits] CMake branch, master, updated. v3.7.2-1141-g0f89100

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  0f891007a902a79acf746479f6bfe19b96899cef (commit)
   via  7f0a21a51eb483c523a2c8880ce4e0466251ec74 (commit)
  from  395f01ef728b3c41b2cab020aff381814244ebe1 (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=0f891007a902a79acf746479f6bfe19b96899cef
commit 0f891007a902a79acf746479f6bfe19b96899cef
Merge: 395f01e 7f0a21a
Author: Brad King 
AuthorDate: Fri Jan 20 11:54:37 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 11:54:37 2017 -0500

Merge topic 'case-insensitive-bindir-detection'

7f0a21a5 cmSystemTools: use the actual case for root detection


---

Summary of changes:
 Source/cmSystemTools.cxx |3 ++-
 1 file changed, 2 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, master, updated. v3.7.2-1139-g395f01e

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  395f01ef728b3c41b2cab020aff381814244ebe1 (commit)
   via  3fc4a2b71a25ba4045a8b80e66ecffba54bd0d54 (commit)
  from  910ef6d0a3eab5d483759ee23f10e91f1c4da8c2 (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=395f01ef728b3c41b2cab020aff381814244ebe1
commit 395f01ef728b3c41b2cab020aff381814244ebe1
Merge: 910ef6d 3fc4a2b
Author: Brad King 
AuthorDate: Fri Jan 20 11:54:34 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 11:54:34 2017 -0500

Merge topic 'cpack-ifw-new-installer-options'

3fc4a2b7 QtIFW: Added new options to QtIFW cpack generator for modifying 
wizard style


---

Summary of changes:
 Help/release/dev/cpack-ifw-package-options.rst |7 ++
 Modules/CPackIFW.cmake |   28 ++
 Source/CPack/IFW/cmCPackIFWInstaller.cxx   |  119 +++-
 Source/CPack/IFW/cmCPackIFWInstaller.h |   25 +
 4 files changed, 176 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/cpack-ifw-package-options.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.7.2-2237-g956e20e

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  956e20ea5b043a20744920dd0dda62c3bd64 (commit)
   via  e78ff350cf2228579077211aab5ed994183235a3 (commit)
  from  d3742568c8597a7e5050e1607ed4e6f91f29bd09 (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=956e20ea5b043a20744920dd0dda62c3bd64
commit 956e20ea5b043a20744920dd0dda62c3bd64
Merge: d374256 e78ff35
Author: Brad King 
AuthorDate: Fri Jan 20 11:44:38 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 11:44:38 2017 -0500

Merge topic 'cdash_upload_retry' into next

e78ff350 Revert topic 'cdash_upload_retry'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e78ff350cf2228579077211aab5ed994183235a3
commit e78ff350cf2228579077211aab5ed994183235a3
Author: Brad King 
AuthorDate: Fri Jan 20 11:44:20 2017 -0500
Commit: Brad King 
CommitDate: Fri Jan 20 11:44:20 2017 -0500

Revert topic 'cdash_upload_retry'

diff --git a/Help/command/ctest_submit.rst b/Help/command/ctest_submit.rst
index a7d9708..6830b59 100644
--- a/Help/command/ctest_submit.rst
+++ b/Help/command/ctest_submit.rst
@@ -56,16 +56,10 @@ Submit to CDash Upload API
 
 ::
 
-  ctest_submit(CDASH_UPLOAD  [CDASH_UPLOAD_TYPE ]
-   [RETRY_COUNT ]
-   [RETRY_DELAY ]
-   [QUIET])
+  ctest_submit(CDASH_UPLOAD  [CDASH_UPLOAD_TYPE ])
 
 This second signature is used to upload files to CDash via the CDash
 file upload API. The api first sends a request to upload to CDash along
 with a content hash of the file. If CDash does not already have the file,
 then it is uploaded. Along with the file, a CDash type string is specified
 to tell CDash which handler to use to process the data.
-
-This signature accepts the ``RETRY_COUNT``, ``RETRY_DELAY``, and ``QUIET``
-options as described above.
diff --git a/Help/release/dev/cdash_upload_retry.rst 
b/Help/release/dev/cdash_upload_retry.rst
deleted file mode 100644
index 2ceb42b..000
--- a/Help/release/dev/cdash_upload_retry.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-cdash-upload-retry

-
-* The ``CDASH_UPLOAD`` signature of :command:`ctest_submit` was taught to honor
-  the ``RETRY_COUNT``, ``RETRY_DELAY``, and ``QUIET`` options.
diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index ab1412d..9a90f54 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -19,7 +19,6 @@ cmCTestCurl::cmCTestCurl(cmCTest* ctest)
   // default is to verify https
   this->VerifyPeerOff = false;
   this->VerifyHostOff = false;
-  this->Quiet = false;
   this->TimeOutSeconds = 0;
   this->Curl = curl_easy_init();
 }
@@ -97,13 +96,6 @@ bool cmCTestCurl::InitCurl()
   }
   // enable HTTP ERROR parsing
   curl_easy_setopt(this->Curl, CURLOPT_FAILONERROR, 1);
-
-  // if there is little to no activity for too long stop submitting
-  if (this->TimeOutSeconds) {
-curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_LIMIT, 1);
-curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_TIME, this->TimeOutSeconds);
-  }
-
   return true;
 }
 
@@ -118,7 +110,12 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
   }
   /* enable uploading */
   curl_easy_setopt(this->Curl, CURLOPT_UPLOAD, 1);
-
+  // if there is little to no activity for too long stop submitting
+  if (this->TimeOutSeconds) {
+::curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_LIMIT, 1);
+::curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_TIME,
+   this->TimeOutSeconds);
+  }
   /* HTTP PUT please */
   ::curl_easy_setopt(this->Curl, CURLOPT_PUT, 1);
   ::curl_easy_setopt(this->Curl, CURLOPT_VERBOSE, 1);
@@ -160,14 +157,13 @@ bool cmCTestCurl::UploadFile(std::string const& 
local_file,
 
   if (!responseData.empty()) {
 response = std::string(responseData.begin(), responseData.end());
-cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-   "Curl response: [" << response << "]\n", this->Quiet);
+cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Curl response: ["
+ << response << "]\n");
   }
   std::string curlDebug;
   if (!debugData.empty()) {
 curlDebug = std::string(debugData.begin(), debugData.end());
-cmCTestOptionalLog(this->CTest, DEBUG,
-   "Curl debug: [" << curlDebug << "]\n", this->Quiet);
+cmCTestLog(this->CTest, DEBUG, "Curl debug: [" << curlDebug << "]\n");
   }
   if (response.empty()) {
 cmCTestLog(this->CTest, ERROR_MESSAGE, "No response from server.\n"

[Cmake-commits] CMake branch, next, updated. v3.7.2-2241-gd9fc72a

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  d9fc72a88c0b400a34619379c002c34cc9ed7117 (commit)
   via  05ed82b1d2175410e8cf4d7f8b4b7ba0514d2589 (commit)
   via  0ce7643a84eabfc1c1083d2f3ecccfae6d04836a (commit)
   via  5614a5cd1f7f8fe34f6b31c572476a2ddfd6d9ae (commit)
  from  956e20ea5b043a20744920dd0dda62c3bd64 (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=d9fc72a88c0b400a34619379c002c34cc9ed7117
commit d9fc72a88c0b400a34619379c002c34cc9ed7117
Merge: 956e20e 05ed82b
Author: Brad King 
AuthorDate: Fri Jan 20 11:44:54 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 11:44:54 2017 -0500

Merge topic 'cdash_upload_retry' into next

05ed82b1 ctest_submit: Update documentation for CDash upload retries
0ce7643a ctest_submit: improve handling of QUIET option
5614a5cd ctest_submit: Allow RETRY_COUNT for CDASH_UPLOAD


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05ed82b1d2175410e8cf4d7f8b4b7ba0514d2589
commit 05ed82b1d2175410e8cf4d7f8b4b7ba0514d2589
Author: Zack Galbreath 
AuthorDate: Mon Jan 16 08:41:35 2017 -0500
Commit: Brad King 
CommitDate: Fri Jan 20 11:37:27 2017 -0500

ctest_submit: Update documentation for CDash upload retries

diff --git a/Help/command/ctest_submit.rst b/Help/command/ctest_submit.rst
index 6830b59..a7d9708 100644
--- a/Help/command/ctest_submit.rst
+++ b/Help/command/ctest_submit.rst
@@ -56,10 +56,16 @@ Submit to CDash Upload API
 
 ::
 
-  ctest_submit(CDASH_UPLOAD  [CDASH_UPLOAD_TYPE ])
+  ctest_submit(CDASH_UPLOAD  [CDASH_UPLOAD_TYPE ]
+   [RETRY_COUNT ]
+   [RETRY_DELAY ]
+   [QUIET])
 
 This second signature is used to upload files to CDash via the CDash
 file upload API. The api first sends a request to upload to CDash along
 with a content hash of the file. If CDash does not already have the file,
 then it is uploaded. Along with the file, a CDash type string is specified
 to tell CDash which handler to use to process the data.
+
+This signature accepts the ``RETRY_COUNT``, ``RETRY_DELAY``, and ``QUIET``
+options as described above.
diff --git a/Help/release/dev/cdash_upload_retry.rst 
b/Help/release/dev/cdash_upload_retry.rst
new file mode 100644
index 000..2ceb42b
--- /dev/null
+++ b/Help/release/dev/cdash_upload_retry.rst
@@ -0,0 +1,5 @@
+cdash-upload-retry
+---
+
+* The ``CDASH_UPLOAD`` signature of :command:`ctest_submit` was taught to honor
+  the ``RETRY_COUNT``, ``RETRY_DELAY``, and ``QUIET`` options.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ce7643a84eabfc1c1083d2f3ecccfae6d04836a
commit 0ce7643a84eabfc1c1083d2f3ecccfae6d04836a
Author: Zack Galbreath 
AuthorDate: Wed Jan 4 12:54:01 2017 -0500
Commit: Brad King 
CommitDate: Fri Jan 20 11:37:27 2017 -0500

ctest_submit: improve handling of QUIET option

Teach the CDASH_UPLOAD signature of ctest_submit() to more thoroughly
respect the QUIET option.

diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index 0fb4239..ab1412d 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -19,6 +19,7 @@ cmCTestCurl::cmCTestCurl(cmCTest* ctest)
   // default is to verify https
   this->VerifyPeerOff = false;
   this->VerifyHostOff = false;
+  this->Quiet = false;
   this->TimeOutSeconds = 0;
   this->Curl = curl_easy_init();
 }
@@ -159,13 +160,14 @@ bool cmCTestCurl::UploadFile(std::string const& 
local_file,
 
   if (!responseData.empty()) {
 response = std::string(responseData.begin(), responseData.end());
-cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Curl response: ["
- << response << "]\n");
+cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+   "Curl response: [" << response << "]\n", this->Quiet);
   }
   std::string curlDebug;
   if (!debugData.empty()) {
 curlDebug = std::string(debugData.begin(), debugData.end());
-cmCTestLog(this->CTest, DEBUG, "Curl debug: [" << curlDebug << "]\n");
+cmCTestOptionalLog(this->CTest, DEBUG,
+   "Curl debug: [" << curlDebug << "]\n", this->Quiet);
   }
   if (response.empty()) {
 cmCTestLog(this->CTest, ERROR_MESSAGE, "No response from server.\n"
@@ -179,9 +181,10 @@ bool cmCTestCurl::HttpRequest(std::string const& url,
   std::string const& fields, std::string& response)
 {
   response = "";
-

[Cmake-commits] CMake branch, next, updated. v3.7.2-2235-gd374256

2017-01-20 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  d3742568c8597a7e5050e1607ed4e6f91f29bd09 (commit)
   via  4dcd4a5da431df5f9fa225b5d264b3c61572ace3 (commit)
  from  e9ae0adbfc45c716d5bafdd9fb8d5d41f8a52983 (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=d3742568c8597a7e5050e1607ed4e6f91f29bd09
commit d3742568c8597a7e5050e1607ed4e6f91f29bd09
Merge: e9ae0ad 4dcd4a5
Author: Brad King 
AuthorDate: Fri Jan 20 10:31:51 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 20 10:31:51 2017 -0500

Merge topic 'productbuild_signing' into next

4dcd4a5d Revert "CPackProductBuild: Add options to sign packages"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4dcd4a5da431df5f9fa225b5d264b3c61572ace3
commit 4dcd4a5da431df5f9fa225b5d264b3c61572ace3
Author: Brad King 
AuthorDate: Fri Jan 20 10:31:37 2017 -0500
Commit: Brad King 
CommitDate: Fri Jan 20 10:31:37 2017 -0500

Revert "CPackProductBuild: Add options to sign packages"

This reverts commit 28b332f1f1aceec9b5c2b598f432454d72711246.

diff --git a/Help/release/dev/cpack-productbuild-signing.rst 
b/Help/release/dev/cpack-productbuild-signing.rst
deleted file mode 100644
index 0b91b38..000
--- a/Help/release/dev/cpack-productbuild-signing.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-cpack-productbuild-signing
---
-
-* The :module:`CPackProductBuild` module gained options to sign packages.
-  See the variables :variable:`CPACK_PRODUCTBUILD_IDENTITY_NAME`,
-  :variable:`CPACK_PRODUCTBUILD_KEYCHAIN_PATH`,
-  :variable:`CPACK_PKGBUILD_IDENTITY_NAME`, and
-  :variable:`CPACK_PKGBUILD_KEYCHAIN_PATH`.
diff --git a/Modules/CPackProductBuild.cmake b/Modules/CPackProductBuild.cmake
index d545d3e..ea2fa7c 100644
--- a/Modules/CPackProductBuild.cmake
+++ b/Modules/CPackProductBuild.cmake
@@ -20,29 +20,9 @@
 #  the automatically detected command (or specify its location if the
 #  auto-detection fails to find it.)
 #
-# .. variable:: CPACK_PRODUCTBUILD_IDENTITY_NAME
-#
-#  Adds a digital signature to the resulting package.
-#
-#
-# .. variable:: CPACK_PRODUCTBUILD_KEYCHAIN_PATH
-#
-#  Specify a specific keychain to search for the signing identity.
-#
-#
 # .. variable:: CPACK_COMMAND_PKGBUILD
 #
 #  Path to the pkgbuild(1) command used to generate an OS X component package
 #  on OS X.  This variable can be used to override the automatically detected
 #  command (or specify its location if the auto-detection fails to find it.)
 #
-#
-# .. variable:: CPACK_PKGBUILD_IDENTITY_NAME
-#
-#  Adds a digital signature to the resulting package.
-#
-#
-# .. variable:: CPACK_PKGBUILD_KEYCHAIN_PATH
-#
-#  Specify a specific keychain to search for the signing identity.
-#
diff --git a/Source/CPack/cmCPackProductBuildGenerator.cxx 
b/Source/CPack/cmCPackProductBuildGenerator.cxx
index 35b2ccc..a46e3a6 100644
--- a/Source/CPack/cmCPackProductBuildGenerator.cxx
+++ b/Source/CPack/cmCPackProductBuildGenerator.cxx
@@ -75,27 +75,14 @@ int cmCPackProductBuildGenerator::PackageFiles()
 
   std::string version = this->GetOption("CPACK_PACKAGE_VERSION");
   std::string productbuild = this->GetOption("CPACK_COMMAND_PRODUCTBUILD");
-  std::string identityName =
-this->GetOption("CPACK_PRODUCTBUILD_IDENTITY_NAME");
-  std::string keychainPath =
-this->GetOption("CPACK_PRODUCTBUILD_KEYCHAIN_PATH");
 
   pkgCmd << productbuild << " --distribution \"" << packageDirFileName
  << "/Contents/distribution.dist\""
  << " --package-path \"" << packageDirFileName << "/Contents/Packages"
  << "\""
  << " --resources \"" << resDir << "\""
- << " --version \"" << version << "\"";
-
-  if (!identityName.empty()) {
-pkgCmd << " --sign \"" << identityName << "\"";
-  }
-
-  if (!keychainPath.empty()) {
-pkgCmd << " --keychain \"" << keychainPath << "\"";
-  }
-
-  pkgCmd << " \"" << packageFileNames[0] << "\"";
+ << " --version \"" << version << "\""
+ << " \"" << packageFileNames[0] << "\"";
 
   // Run ProductBuild
   return RunProductBuild(pkgCmd.str());
@@ -206,24 +193,13 @@ bool 
cmCPackProductBuildGenerator::GenerateComponentPackage(
 
   std::string version = this->GetOption("CPACK_PACKAGE_VERSION");
   std::string pkgbuild = this->GetOption("CPACK_COMMAND_PKGBUILD");
-  std::string identityName = this->GetOption("CPACK_PKGBUILD_IDENTITY_NAME");
-  std::string keychainPath = this->GetOption("CPACK_PKGBUILD_KEYCHAIN_PATH");
 
   pkgCmd << pkgbuild << " --root \"" << packageDir << "\""