[Cmake-commits] CMake branch, master, updated. v3.5.0-190-gaf35bed

[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  af35bede1ad384d0959928e8b8403dc0c8e5bdc5 (commit)
  from  b19bc31277bb2e3dd75e78f64924be3955ea8c6d (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=af35bede1ad384d0959928e8b8403dc0c8e5bdc5
commit af35bede1ad384d0959928e8b8403dc0c8e5bdc5
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Thu Mar 10 00:01:06 2016 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Mar 10 00:01:06 2016 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index b65f25d..b60c3b3 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 5)
-set(CMake_VERSION_PATCH 20160309)
+set(CMake_VERSION_PATCH 20160310)
 #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.5.0-411-g730be0e

[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  730be0e891795f3cbbc6e506a52b7bb612eb1fbb (commit)
   via  6c35ae879aacfa1158698dbc3fac00f79377a256 (commit)
  from  49cff25ca3e667d6d5a20a6b64ed55ef875890c1 (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=730be0e891795f3cbbc6e506a52b7bb612eb1fbb
commit 730be0e891795f3cbbc6e506a52b7bb612eb1fbb
Merge: 49cff25 6c35ae8
Author: Brad King 
AuthorDate: Wed Mar 9 14:49:12 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 9 14:49:12 2016 -0500

Merge topic 'vs-clang-cl' into next

6c35ae87 fixup! VS: in Clang/C2 toolset, setup correct compiler settings


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c35ae879aacfa1158698dbc3fac00f79377a256
commit 6c35ae879aacfa1158698dbc3fac00f79377a256
Author: Brad King 
AuthorDate: Wed Mar 9 14:47:35 2016 -0500
Commit: Brad King 
CommitDate: Wed Mar 9 14:47:35 2016 -0500

fixup! VS: in Clang/C2 toolset, setup correct compiler settings

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx 
b/Source/cmVisualStudio10TargetGenerator.cxx
index 3b79087..31873b5 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2079,7 +2079,8 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
   if(this->MSTools)
 {
 cmsys::RegularExpression clangToolset("v[0-9]+_clang_.*");
-if (clangToolset.find(this->GlobalGenerator->GetPlatformToolset()))
+const char* toolset = this->GlobalGenerator->GetPlatformToolset();
+if (toolset && clangToolset.find(toolset))
   {
   this->WriteString(""
 "$(IntDir)%(filename).obj"

---

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.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, next, updated. v3.5.0-409-g49cff25

[Gregor Jasny via Cmake-commits]

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  49cff25ca3e667d6d5a20a6b64ed55ef875890c1 (commit)
   via  111cd679191c8aa4e081765ac4f7bc2e08657c7f (commit)
  from  96f661517d1e98a7a940f16781e6713745074e2a (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=49cff25ca3e667d6d5a20a6b64ed55ef875890c1
commit 49cff25ca3e667d6d5a20a6b64ed55ef875890c1
Merge: 96f6615 111cd67
Author: Gregor Jasny 
AuthorDate: Wed Mar 9 14:33:43 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 9 14:33:43 2016 -0500

Merge topic 'xcode-regenerate-on-deleted-files' into next

111cd679 Xcode: ReRunCMake even if files disappeared (#15992)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=111cd679191c8aa4e081765ac4f7bc2e08657c7f
commit 111cd679191c8aa4e081765ac4f7bc2e08657c7f
Author: Gregor Jasny 
AuthorDate: Sun Mar 6 17:46:53 2016 +0100
Commit: Gregor Jasny 
CommitDate: Wed Mar 9 20:33:01 2016 +0100

Xcode: ReRunCMake even if files disappeared (#15992)

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index ef18729..7c85281 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -593,19 +593,28 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   cmGeneratedFileStream makefileStream
 (this->CurrentReRunCMakeMakefile.c_str());
   makefileStream.SetCopyIfDifferent(true);
-  makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  std::string checkCache = root->GetBinaryDirectory();
-  checkCache += "/";
-  checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
-  checkCache += "cmake.check_cache";
-  makefileStream << this->ConvertToRelativeForMake(checkCache.c_str())
- << ": ";
+  makefileStream << "# Generated by CMake, DO NOT EDIT\n\n";
+
+  makefileStream << "empty:= \n";
+  makefileStream << "space:= $(empty) $(empty)\n";
+  makefileStream << "spaceplus:= $(empty)\\ $(empty)\n\n";
+
   for(std::vector::const_iterator i = lfiles.begin();
   i !=  lfiles.end(); ++i)
 {
-makefileStream << "\\\n" << this->ConvertToRelativeForMake(i->c_str());
+makefileStream << "TARGETS += $(subst $(space),$(spaceplus),$(wildcard "
+   << this->ConvertToRelativeForMake(i->c_str())
+   << "))\n";
 }
-  makefileStream << "\n\t" <<
+
+  std::string checkCache = root->GetBinaryDirectory();
+  checkCache += "/";
+  checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
+  checkCache += "cmake.check_cache";
+
+  makefileStream << "\n" << this->ConvertToRelativeForMake(checkCache.c_str())
+ << ": $(TARGETS)\n";
+  makefileStream << "\t" <<
 this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
  << " -H" << this->ConvertToRelativeForMake(
root->GetSourceDirectory())
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake 
b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
index 31c72fb..51e0b0a 100644
--- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
+++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
@@ -40,3 +40,42 @@ if(NOT RunCMake_GENERATOR MATCHES "Visual Studio [67]|Xcode")
 endif()
 
 run_BuildDepends(Custom-Always)
+
+function(run_ReGeneration)
+  # test re-generation of project even if CMakeLists.txt files disappeared
+
+  # Use a single build tree for a few tests without cleaning.
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/regenerate-project-build)
+  set(RunCMake_TEST_SOURCE_DIR 
${RunCMake_BINARY_DIR}/regenerate-project-source)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}")
+  set(ProjectHeader [=[
+cmake_minimum_required(VERSION 3.5)
+project(Regenerate-Project NONE)
+  ]=])
+
+  # create project with subdirectory
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}"
+"add_subdirectory(mysubdir)")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/mysubdir/CMakeLists.txt" "# empty")
+
+  run_cmake(Regenerate-Project)
+  execute_process(COMMAND ${CMAKE_COMMAND} -E sleep ${fs_delay})
+
+  # now we delete the subdirectory and adjust the CMakeLists.txt
+  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}")
+
+  run_cmake_command(Regenerate-Project-Directory-Removed
+${CMAKE_COMMAND} --build 

[Cmake-commits] CMake branch, next, updated. v3.5.0-407-g96f6615

[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  96f661517d1e98a7a940f16781e6713745074e2a (commit)
   via  97149ff8db660c4cb49b5061157f3d0b34adcacb (commit)
   via  a35f4be61ff49e39152d63e4a8b56ee820d4c5fe (commit)
   via  afac3d107d7a12e6a6e425a446787d817fd2fe25 (commit)
  from  d13971ab60120570bac9c30ac6ce93d3a76be4db (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=96f661517d1e98a7a940f16781e6713745074e2a
commit 96f661517d1e98a7a940f16781e6713745074e2a
Merge: d13971a 97149ff
Author: Brad King 
AuthorDate: Wed Mar 9 13:59:17 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 9 13:59:17 2016 -0500

Merge topic 'update-third-party' into next

97149ff8 update-third-party: read attributes from the worktree
a35f4be6 update-third-party: Add license notice
afac3d10 update-third-party: remove empty directories as well


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97149ff8db660c4cb49b5061157f3d0b34adcacb
commit 97149ff8db660c4cb49b5061157f3d0b34adcacb
Author: Ben Boeckel 
AuthorDate: Mon Feb 8 13:37:01 2016 -0500
Commit: Brad King 
CommitDate: Wed Mar 9 13:57:57 2016 -0500

update-third-party: read attributes from the worktree

This should be done so that any attributes for ignoring certain files
when exporting can be appended to the file during the extraction step,
but ignored in the actual import. Necessary for importing the gitsetup
repository.

diff --git a/Utilities/Scripts/update-third-party.bash 
b/Utilities/Scripts/update-third-party.bash
index d973671..6aeeccd 100644
--- a/Utilities/Scripts/update-third-party.bash
+++ b/Utilities/Scripts/update-third-party.bash
@@ -48,7 +48,7 @@
 # Utility functions
 
 git_archive () {
-git archive --prefix="$name-reduced/" HEAD -- $paths | \
+git archive --worktree-attributes --prefix="$name-reduced/" HEAD -- $paths 
| \
 tar -C "$extractdir" -x
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a35f4be61ff49e39152d63e4a8b56ee820d4c5fe
commit a35f4be61ff49e39152d63e4a8b56ee820d4c5fe
Author: Brad King 
AuthorDate: Fri Feb 5 13:37:45 2016 -0500
Commit: Brad King 
CommitDate: Wed Mar 9 13:57:41 2016 -0500

update-third-party: Add license notice

Our Git infrastructure scripts use the "Apache License 2.0".

diff --git a/Utilities/Scripts/update-third-party.bash 
b/Utilities/Scripts/update-third-party.bash
index d4d346c..d973671 100644
--- a/Utilities/Scripts/update-third-party.bash
+++ b/Utilities/Scripts/update-third-party.bash
@@ -1,3 +1,19 @@
+#=
+# Copyright 2015-2016 Kitware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=
+
 
 # Script for updating third party packages.
 #

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afac3d107d7a12e6a6e425a446787d817fd2fe25
commit afac3d107d7a12e6a6e425a446787d817fd2fe25
Author: Ben Boeckel 
AuthorDate: Tue Feb 2 14:23:24 2016 -0500
Commit: Brad King 
CommitDate: Wed Mar 9 13:57:27 2016 -0500

update-third-party: remove empty directories as well

The `git ls-files | xargs rm` removes only files; directories which are
empty are left laying around. This later chokes the `mv` which puts the
"reduced" directory into place. Remove the empty directories as well.

diff --git a/Utilities/Scripts/update-third-party.bash 
b/Utilities/Scripts/update-third-party.bash
index 8925296..d4d346c 100644
--- a/Utilities/Scripts/update-third-party.bash
+++ b/Utilities/Scripts/update-third-party.bash
@@ -85,6 +85,7 @@ if [ -n "$basehash" ]; then
 # Clear out the working tree
 pushd "$extractdir"
 

[Cmake-commits] CMake branch, next, updated. v3.5.0-400-gaabb3f2

[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  aabb3f247d1846ae8c65b80477119fd90c24dfc5 (commit)
   via  43fbcba2586f9e439998c08690b80d350a996065 (commit)
  from  8eb1b66b1259d4940c66ab3665f1e64c75cb0271 (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=aabb3f247d1846ae8c65b80477119fd90c24dfc5
commit aabb3f247d1846ae8c65b80477119fd90c24dfc5
Merge: 8eb1b66 43fbcba
Author: Brad King 
AuthorDate: Wed Mar 9 09:41:20 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 9 09:41:20 2016 -0500

Merge topic 'update-osx-release' into next

43fbcba2 Help: Add notes for topic 'update-osx-release'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43fbcba2586f9e439998c08690b80d350a996065
commit 43fbcba2586f9e439998c08690b80d350a996065
Author: Brad King 
AuthorDate: Wed Mar 9 08:29:51 2016 -0500
Commit: Brad King 
CommitDate: Wed Mar 9 08:29:51 2016 -0500

Help: Add notes for topic 'update-osx-release'

diff --git a/Help/release/dev/update-osx-release.rst 
b/Help/release/dev/update-osx-release.rst
new file mode 100644
index 000..7634c05
--- /dev/null
+++ b/Help/release/dev/update-osx-release.rst
@@ -0,0 +1,5 @@
+update-osx-release
+--
+
+* The precompiled OS X binary provided on ``cmake.org`` now requires
+  OS X 10.7 or newer.

---

Summary of changes:
 Help/release/dev/update-osx-release.rst |5 +
 1 file changed, 5 insertions(+)
 create mode 100644 Help/release/dev/update-osx-release.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.5.0-398-g8eb1b66

[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  8eb1b66b1259d4940c66ab3665f1e64c75cb0271 (commit)
   via  eab942590281310493aa9f82b460ee601bf87939 (commit)
   via  4c8a101e81a48dee6df7054dbe603da7685283a8 (commit)
   via  5fdd7b6b5fcd32b72b059415d66f0e991fd77aec (commit)
   via  d1e9d12191038378496c44c89885162df3e7b297 (commit)
   via  71c09356b02fd43da38488a5a0c18738e087a436 (commit)
   via  7726767af37ed49eb68b1674ab1ecf12d85276ec (commit)
   via  1a902f240eebe23a846340a49fa4230a73a96b7d (commit)
   via  2ec615000b04b10f91469a4dddeddb1e5ed53479 (commit)
   via  384a9f6b0aeddaefc83b36429be0cf7c6edac36c (commit)
   via  99b38f32bf0c8aedd01ec79cc97e3f5ab0e7dbe3 (commit)
   via  1f913700e6f5dce49fbd48b997f771d1f8f6fe29 (commit)
   via  0a0c98ce0a45ca9fcba2830b7b06c571238f313c (commit)
  from  ed3c228dc0ae7145a581c16278ffb2a534299403 (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=8eb1b66b1259d4940c66ab3665f1e64c75cb0271
commit 8eb1b66b1259d4940c66ab3665f1e64c75cb0271
Merge: ed3c228 eab9425
Author: Brad King 
AuthorDate: Wed Mar 9 09:36:49 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 9 09:36:49 2016 -0500

Merge topic 'vs-clang-cl' into next

eab94259 Help: Add notes for topic 'vs-clang-cl'
4c8a101e Tests: do not build PrecompiledHeader on Clang/C2
5fdd7b6b Tests: fix PDBDirectoryAndName on Clang/C2
d1e9d121 Tests: fix Plugin building on Clang/C2
71c09356 Tests: fix complexOneConfig building on Clang/C2
7726767a Tests: fix Complex building on Clang/C2
1a902f24 Tests: fix Module.GenerateExportHeader building on Clang/C2
2ec61500 Tests: fix AliasTarget building on Clang/C2
384a9f6b VS 14: Add flag map for -std= to CppLanguageStandard tag in 
project files
99b38f32 Features: Clang has no cxx_decltype_incomplete_return_type in MSVC 
sim mode
1f913700 VS: in Clang/C2 toolset, setup correct compiler settings
0a0c98ce CMakeDetermineCompilerId: Add detection of clang.exe bundled with 
VS


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eab942590281310493aa9f82b460ee601bf87939
commit eab942590281310493aa9f82b460ee601bf87939
Author: Brad King 
AuthorDate: Tue Mar 8 09:48:23 2016 -0500
Commit: Brad King 
CommitDate: Wed Mar 9 09:20:39 2016 -0500

Help: Add notes for topic 'vs-clang-cl'

diff --git a/Help/release/dev/vs-clang-cl.rst b/Help/release/dev/vs-clang-cl.rst
new file mode 100644
index 000..ac09188
--- /dev/null
+++ b/Help/release/dev/vs-clang-cl.rst
@@ -0,0 +1,5 @@
+vs-clang-cl
+---
+
+* The :generator:`Visual Studio 14 2015` generator learned to support the
+  Clang/C2 toolsets, e.g. with the ``-T v140_clang_3_7`` option.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c8a101e81a48dee6df7054dbe603da7685283a8
commit 4c8a101e81a48dee6df7054dbe603da7685283a8
Author: Mariusz Pluciński 
AuthorDate: Tue Feb 23 23:20:32 2016 +0100
Commit: Brad King 
CommitDate: Wed Mar 9 09:20:15 2016 -0500

Tests: do not build PrecompiledHeader on Clang/C2

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c7d2138..a4b8757 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1744,7 +1744,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P 
${CMake_SOURCE_DIR}/Utilities/Release
   if(MSVC)
 ADD_TEST_MACRO(ForceInclude foo)
 ADD_TEST_MACRO(PDBDirectoryAndName myexe)
-ADD_TEST_MACRO(PrecompiledHeader foo)
+if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
+  ADD_TEST_MACRO(PrecompiledHeader foo)
+endif()
   endif()
   if(MSVC OR
   "${CMAKE_GENERATOR}" MATCHES "(MSYS|MinGW) Makefiles")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fdd7b6b5fcd32b72b059415d66f0e991fd77aec
commit 5fdd7b6b5fcd32b72b059415d66f0e991fd77aec
Author: Mariusz Pluciński 
AuthorDate: Sun Feb 21 01:17:29 2016 +0100
Commit: Brad King 
CommitDate: Wed Mar 9 09:20:15 2016 -0500

Tests: fix PDBDirectoryAndName on Clang/C2

diff --git a/Tests/PDBDirectoryAndName/CMakeLists.txt 
b/Tests/PDBDirectoryAndName/CMakeLists.txt
index 180f9fe..5fd69ef 100644
--- a/Tests/PDBDirectoryAndName/CMakeLists.txt
+++ b/Tests/PDBDirectoryAndName/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 2.8)
+cmake_policy(SET CMP0054 NEW)
 project(PDBDirectoryAndName C)
 
 # Make sure the proper compiler is in use.
@@ -62,6 +63,14 @@ list(APPEND my_targets myexe2)

[Cmake-commits] CMake branch, next, updated. v3.5.0-385-ged3c228

[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  ed3c228dc0ae7145a581c16278ffb2a534299403 (commit)
   via  fd466fe657da176e3fa46803a11dfcb662d7395d (commit)
   via  cd4fef3041be85e1ec9139a91efa8a96f74707c5 (commit)
  from  6ff0e39f41989d845d9a76511181791966eab28c (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=ed3c228dc0ae7145a581c16278ffb2a534299403
commit ed3c228dc0ae7145a581c16278ffb2a534299403
Merge: 6ff0e39 fd466fe
Author: Brad King 
AuthorDate: Wed Mar 9 09:13:54 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 9 09:13:54 2016 -0500

Merge topic 'update-kwsys' into next

fd466fe6 Merge branch 'upstream-KWSys' into update-kwsys
cd4fef30 KWSys 2016-03-09 (36d8666f)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd466fe657da176e3fa46803a11dfcb662d7395d
commit fd466fe657da176e3fa46803a11dfcb662d7395d
Merge: b19bc31 cd4fef3
Author: Brad King 
AuthorDate: Wed Mar 9 09:10:55 2016 -0500
Commit: Brad King 
CommitDate: Wed Mar 9 09:10:55 2016 -0500

Merge branch 'upstream-KWSys' into update-kwsys

* upstream-KWSys:
  KWSys 2016-03-09 (36d8666f)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd4fef3041be85e1ec9139a91efa8a96f74707c5
commit cd4fef3041be85e1ec9139a91efa8a96f74707c5
Author: KWSys Upstream 
AuthorDate: Wed Mar 9 09:09:41 2016 -0500
Commit: Brad King 
CommitDate: Wed Mar 9 09:10:55 2016 -0500

KWSys 2016-03-09 (36d8666f)

Code extracted from:

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

at commit 36d8666f44a75a6debb92c86c20f25d929d79cd1 (master).

Upstream Shortlog
-

Zack Galbreath (1):
  36d8666f Process: Add function to reset the start time of a process

diff --git a/Process.h.in b/Process.h.in
index c5ebc97..96563a2 100644
--- a/Process.h.in
+++ b/Process.h.in
@@ -77,6 +77,7 @@
 # define kwsysProcess_WaitForExit   kwsys_ns(Process_WaitForExit)
 # define kwsysProcess_Interrupt kwsys_ns(Process_Interrupt)
 # define kwsysProcess_Kill  kwsys_ns(Process_Kill)
+# define kwsysProcess_ResetStartTime
kwsys_ns(Process_ResetStartTime)
 #endif
 
 #if defined(__cplusplus)
@@ -392,6 +393,11 @@ kwsysEXPORT void kwsysProcess_Interrupt(kwsysProcess* cp);
  */
 kwsysEXPORT void kwsysProcess_Kill(kwsysProcess* cp);
 
+/**
+ * Reset the start time of the child process to the current time.
+ */
+kwsysEXPORT void kwsysProcess_ResetStartTime(kwsysProcess* cp);
+
 #if defined(__cplusplus)
 } /* extern "C" */
 #endif
@@ -456,6 +462,7 @@ kwsysEXPORT void kwsysProcess_Kill(kwsysProcess* cp);
 #  undef kwsysProcess_WaitForExit
 #  undef kwsysProcess_Interrupt
 #  undef kwsysProcess_Kill
+#  undef kwsysProcess_ResetStartTime
 # endif
 #endif
 
diff --git a/ProcessUNIX.c b/ProcessUNIX.c
index 7402955..b577982 100644
--- a/ProcessUNIX.c
+++ b/ProcessUNIX.c
@@ -3058,3 +3058,14 @@ static void kwsysProcessesSignalHandler(int signum
 
   errno = old_errno;
 }
+
+/*--*/
+void kwsysProcess_ResetStartTime(kwsysProcess* cp)
+{
+  if(!cp)
+{
+return;
+}
+  /* Reset start time. */
+  cp->StartTime = kwsysProcessTimeGetCurrent();
+}
diff --git a/ProcessWin32.c b/ProcessWin32.c
index a18ea27..2b93e69 100644
--- a/ProcessWin32.c
+++ b/ProcessWin32.c
@@ -3017,3 +3017,14 @@ static BOOL WINAPI kwsysCtrlHandler(DWORD dwCtrlType)
   /* Continue on to default Ctrl handler (which calls ExitProcess).  */
   return FALSE;
 }
+
+/*--*/
+void kwsysProcess_ResetStartTime(kwsysProcess* cp)
+{
+  if(!cp)
+{
+return;
+}
+  /* Reset start time. */
+  cp->StartTime = kwsysProcessTimeGetCurrent();
+}

---

Summary of changes:
 Source/kwsys/Process.h.in   |7 +++
 Source/kwsys/ProcessUNIX.c  |   11 +++
 Source/kwsys/ProcessWin32.c |   11 +++
 3 files changed, 29 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.5.0-382-g6ff0e39

[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  6ff0e39f41989d845d9a76511181791966eab28c (commit)
   via  1b029ea91fe95f3fb036b3b60cf68c2883727ca3 (commit)
   via  add2557865923af058334ba64a889842fc2abd05 (commit)
  from  6f92f9c5ead82168eba18ada867b25ce69c37fd3 (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=6ff0e39f41989d845d9a76511181791966eab28c
commit 6ff0e39f41989d845d9a76511181791966eab28c
Merge: 6f92f9c 1b029ea
Author: Brad King 
AuthorDate: Wed Mar 9 08:57:38 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 9 08:57:38 2016 -0500

Merge topic 'FindJNI-ubuntu-paths' into next

1b029ea9 FindJNI: Append path only "if(EXISTS"
add25578 FindJNI: Add support for Ubuntu 15.10


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b029ea91fe95f3fb036b3b60cf68c2883727ca3
commit 1b029ea91fe95f3fb036b3b60cf68c2883727ca3
Author: O. Libre 
AuthorDate: Tue Mar 8 06:06:20 2016 +0100
Commit: Brad King 
CommitDate: Wed Mar 9 08:55:13 2016 -0500

FindJNI: Append path only "if(EXISTS"

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 467e3d6..8fe8f7a 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -92,10 +92,14 @@ macro(java_append_library_directories _var)
 if(_path MATCHES "{libarch}")
 foreach(_libarch ${_java_libarch})
 string(REPLACE "{libarch}" "${_libarch}" _newpath "${_path}")
-list(APPEND ${_var} "${_newpath}")
+if(EXISTS ${_newpath})
+list(APPEND ${_var} "${_newpath}")
+endif()
 endforeach()
 else()
-list(APPEND ${_var} "${_path}")
+if(EXISTS ${_path})
+list(APPEND ${_var} "${_path}")
+endif()
 endif()
 endforeach()
 endmacro()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=add2557865923af058334ba64a889842fc2abd05
commit add2557865923af058334ba64a889842fc2abd05
Author: O. Libre 
AuthorDate: Tue Mar 8 06:02:49 2016 +0100
Commit: Brad King 
CommitDate: Wed Mar 9 08:55:13 2016 -0500

FindJNI: Add support for Ubuntu 15.10

- Reuse JAVA_APPEND_LIBRARY_DIRECTORIES for JAVA_AWT_INCLUDE_DIRECTORIES
- Append three directories /usr/lib/jvm/java-{8,7,6}-openjdk-{libarch}

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 135038c..467e3d6 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -147,6 +147,9 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
   /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch}   # can this one be 
removed according to #8821 ? Alex
   /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
   /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch}# fedora
+  /usr/lib/jvm/java-8-openjdk-{libarch}/lib/{libarch}  # ubuntu 
15.10
+  /usr/lib/jvm/java-7-openjdk-{libarch}/lib/{libarch}  # ubuntu 
15.10
+  /usr/lib/jvm/java-6-openjdk-{libarch}/lib/{libarch}  # ubuntu 
15.10
   # Debian specific paths for default JVM
   /usr/lib/jvm/default-java/jre/lib/{libarch}
   /usr/lib/jvm/default-java/jre/lib
@@ -181,6 +184,9 @@ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.4;JavaHome]/include"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.3;JavaHome]/include"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\${java_install_version};JavaHome]/include"
+)
+
+JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
   /usr/include
   /usr/local/include
   /usr/lib/java/include
@@ -190,6 +196,9 @@ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
   /usr/lib/jvm/java-1.5.0-sun/include
   /usr/lib/jvm/java-6-sun-1.6.0.00/include   # can this one be removed 
according to #8821 ? Alex
   /usr/lib/jvm/java-6-openjdk/include
+  /usr/lib/jvm/java-8-openjdk-{libarch}/include  # ubuntu 15.10
+  /usr/lib/jvm/java-7-openjdk-{libarch}/include  # ubuntu 15.10
+  /usr/lib/jvm/java-6-openjdk-{libarch}/include  # ubuntu 15.10
   /usr/local/share/java/include
   /usr/lib/j2sdk1.4-sun/include
   /usr/lib/j2sdk1.5-sun/include

---

Summary of changes:
 Modules/FindJNI.cmake |   17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.5.0-379-g6f92f9c

[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  6f92f9c5ead82168eba18ada867b25ce69c37fd3 (commit)
   via  b19bc31277bb2e3dd75e78f64924be3955ea8c6d (commit)
   via  345d5926ee01d716f11c9bf8380fec180088d5a3 (commit)
   via  d1856e2e333001d0f106a3af86dfe000fd61b2b2 (commit)
   via  ca274d39b7172c603b2c8e66175aa2838627b70d (commit)
   via  6b9dc804ee9072f12683761be97976ac1d8c7585 (commit)
  from  9e21a254790a6998010de0ac969a16d863a09182 (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=6f92f9c5ead82168eba18ada867b25ce69c37fd3
commit 6f92f9c5ead82168eba18ada867b25ce69c37fd3
Merge: 9e21a25 b19bc31
Author: Brad King 
AuthorDate: Wed Mar 9 08:50:27 2016 -0500
Commit: Brad King 
CommitDate: Wed Mar 9 08:50:27 2016 -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.5.0-182-gca274d3

[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  ca274d39b7172c603b2c8e66175aa2838627b70d (commit)
   via  37e8ccee54dc76f8efc9717a063414f45f85530f (commit)
  from  6b9dc804ee9072f12683761be97976ac1d8c7585 (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=ca274d39b7172c603b2c8e66175aa2838627b70d
commit ca274d39b7172c603b2c8e66175aa2838627b70d
Merge: 6b9dc80 37e8cce
Author: Brad King 
AuthorDate: Wed Mar 9 08:49:59 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 9 08:49:59 2016 -0500

Merge topic 'GetPrerequisites-canonical-path'

37e8ccee GetPrerequisites: Fix gp_resolved_file_type on non-canonical paths


---

Summary of changes:
 Modules/GetPrerequisites.cmake |2 ++
 1 file changed, 2 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.5.0-184-gd1856e2

[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  d1856e2e333001d0f106a3af86dfe000fd61b2b2 (commit)
   via  a4194debea02e723d21f6db83a4528254d885f13 (commit)
  from  ca274d39b7172c603b2c8e66175aa2838627b70d (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=d1856e2e333001d0f106a3af86dfe000fd61b2b2
commit d1856e2e333001d0f106a3af86dfe000fd61b2b2
Merge: ca274d3 a4194de
Author: Brad King 
AuthorDate: Wed Mar 9 08:50:01 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 9 08:50:01 2016 -0500

Merge topic 'add-FindLTTngUST'

a4194deb Add FindLTTngUST module to find LTTng-UST library


---

Summary of changes:
 Help/manual/cmake-modules.7.rst  |1 +
 Help/module/FindLTTngUST.rst |1 +
 Help/release/dev/add-FindLTTngUST.rst|5 +
 Modules/FindLTTngUST.cmake   |  111 ++
 Tests/CMakeLists.txt |4 +
 Tests/CMakeOnly/AllFindModules/CMakeLists.txt|2 +-
 Tests/{FindBoost => FindLTTngUST}/CMakeLists.txt |8 +-
 Tests/FindLTTngUST/Test/CMakeLists.txt   |   18 
 Tests/FindLTTngUST/Test/main.c   |   31 ++
 9 files changed, 176 insertions(+), 5 deletions(-)
 create mode 100644 Help/module/FindLTTngUST.rst
 create mode 100644 Help/release/dev/add-FindLTTngUST.rst
 create mode 100644 Modules/FindLTTngUST.cmake
 copy Tests/{FindBoost => FindLTTngUST}/CMakeLists.txt (52%)
 create mode 100644 Tests/FindLTTngUST/Test/CMakeLists.txt
 create mode 100644 Tests/FindLTTngUST/Test/main.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.5.0-186-g345d592

[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  345d5926ee01d716f11c9bf8380fec180088d5a3 (commit)
   via  d929c35f08957dc57bbdd802964cb3fb0f4282e1 (commit)
  from  d1856e2e333001d0f106a3af86dfe000fd61b2b2 (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=345d5926ee01d716f11c9bf8380fec180088d5a3
commit 345d5926ee01d716f11c9bf8380fec180088d5a3
Merge: d1856e2 d929c35
Author: Brad King 
AuthorDate: Wed Mar 9 08:50:04 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 9 08:50:04 2016 -0500

Merge topic 'deprecate-CMakeForceCompiler'

d929c35f CMakeForceCompiler: Deprecate this module and its macros


---

Summary of changes:
 Help/manual/cmake-toolchains.7.rst|7 ---
 Help/release/dev/deprecate-CMakeForceCompiler.rst |5 +
 Modules/CMakeForceCompiler.cmake  |   20 
 3 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 Help/release/dev/deprecate-CMakeForceCompiler.rst


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

[Cmake-commits] CMake branch, master, updated. v3.5.0-189-gb19bc31

[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  b19bc31277bb2e3dd75e78f64924be3955ea8c6d (commit)
   via  ea04ec09d8d4fc6bdc5610d85f558c384d64b368 (commit)
   via  4ba9b473a20cdf1284522dabb170b611fbf0f02e (commit)
  from  345d5926ee01d716f11c9bf8380fec180088d5a3 (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=b19bc31277bb2e3dd75e78f64924be3955ea8c6d
commit b19bc31277bb2e3dd75e78f64924be3955ea8c6d
Merge: 345d592 ea04ec0
Author: Brad King 
AuthorDate: Wed Mar 9 08:50:06 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 9 08:50:06 2016 -0500

Merge topic 'update-kwsys'

ea04ec09 Merge branch 'upstream-KWSys' into update-kwsys
4ba9b473 KWSys 2016-03-08 (6b60c184)


---

Summary of changes:
 Source/kwsys/MD5.c |8 
 Source/kwsys/SystemInformation.cxx |   12 ++--
 Source/kwsys/SystemTools.cxx   |5 +++--
 Source/kwsys/testDynamicLoader.cxx |2 +-
 4 files changed, 14 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.5.0-373-g9e21a25

[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  9e21a254790a6998010de0ac969a16d863a09182 (commit)
   via  63c4133b38f665bcf77bd92c08cbdc2e7ebee178 (commit)
  from  de5a90b6c84830d69b73e06a35e9c40330184f38 (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=9e21a254790a6998010de0ac969a16d863a09182
commit 9e21a254790a6998010de0ac969a16d863a09182
Merge: de5a90b 63c4133
Author: Brad King 
AuthorDate: Wed Mar 9 08:38:21 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 9 08:38:21 2016 -0500

Merge topic 'clang-iframework-version' into next

63c4133b OS X: Use -iframework with Clang only on version >= 3.2


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63c4133b38f665bcf77bd92c08cbdc2e7ebee178
commit 63c4133b38f665bcf77bd92c08cbdc2e7ebee178
Author: Jean-Christophe Fillion-Robin 
AuthorDate: Wed Mar 9 00:50:21 2016 -0500
Commit: Brad King 
CommitDate: Wed Mar 9 08:37:29 2016 -0500

OS X: Use -iframework with Clang only on version >= 3.2

Since commit v3.1.0-rc1~564^2 (OS X: Use -iframework for system
framework directories, 2014-05-05) we test the version of Clang is smaller
that 3.1 to see if it supports -iframework.

Considering that "iframework" support has been added in clang@r142418
(Frontend: Support -iframework.) prior to clang 3.1, this made sense.

That said, considering that support for multiple -iframework parameters
has been added later in clang@r164607 (-iframework should allow separate
arguments. ) prior to clang 3.2, this commit updates the check to enable
framework support only if version is >= 3.2

diff --git a/Modules/Platform/Darwin-Clang.cmake 
b/Modules/Platform/Darwin-Clang.cmake
index 4cded47..61a5e0c 100644
--- a/Modules/Platform/Darwin-Clang.cmake
+++ b/Modules/Platform/Darwin-Clang.cmake
@@ -24,7 +24,7 @@ macro(__darwin_compiler_clang lang)
   set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "-bundle 
-Wl,-headerpad_max_install_names")
   set(CMAKE_${lang}_SYSROOT_FLAG "-isysroot")
   set(CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG "-mmacosx-version-min=")
-  if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 3.1)
+  if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 3.2)
 set(CMAKE_${lang}_SYSTEM_FRAMEWORK_SEARCH_FLAG "-iframework ")
   endif()
 endmacro()

---

Summary of changes:
 Modules/Platform/Darwin-Clang.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