[Cmake-commits] CMake branch, master, updated. v3.10.2-1058-g3b8b379

[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  3b8b379852bbbe3a942834072e4533f2592d00ef (commit)
   via  16c6764f9bf86298c9cc9407d9e22d0aca189514 (commit)
   via  43cd9467cd2b0c1dde6e69a042032ea83422dbda (commit)
   via  101ef67b99ed0455cced14d0a1f85ab8a47e11a6 (commit)
   via  2a730e24c618768ecbb5bdd67886e7bc9bfc8a7f (commit)
   via  4349393d1d55abb9977d62d921af2e1fd9f27f29 (commit)
  from  31550ebf31a59be391319c2885db46ea8b3a0875 (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=3b8b379852bbbe3a942834072e4533f2592d00ef
commit 3b8b379852bbbe3a942834072e4533f2592d00ef
Merge: 16c6764 43cd946
Author: Brad King 
AuthorDate: Tue Feb 13 11:18:35 2018 -0500
Commit: Brad King 
CommitDate: Tue Feb 13 11:18:35 2018 -0500

Merge branch 'release-3.11'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16c6764f9bf86298c9cc9407d9e22d0aca189514
commit 16c6764f9bf86298c9cc9407d9e22d0aca189514
Merge: 31550eb 4349393
Author: Brad King 
AuthorDate: Tue Feb 13 16:17:16 2018 +
Commit: Kitware Robot 
CommitDate: Tue Feb 13 11:17:25 2018 -0500

Merge topic '17711-reset-xcode-target-var'

4349393d cmGlobalXCodeGenerator: Properly initialize TARGETS variable

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


---

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, release, updated. v3.10.2-1044-g43cd946

[Kitware Robot]

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

The branch, release has been updated
   via  43cd9467cd2b0c1dde6e69a042032ea83422dbda (commit)
   via  101ef67b99ed0455cced14d0a1f85ab8a47e11a6 (commit)
   via  2a730e24c618768ecbb5bdd67886e7bc9bfc8a7f (commit)
   via  4349393d1d55abb9977d62d921af2e1fd9f27f29 (commit)
   via  917852396866933f35cd723318f42290753873ff (commit)
   via  c85ef9c339a9aea5160217e33f917b5d130c9fab (commit)
  from  51b287c40cd80a0c27caa3f99cd8d729c20cc3e5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
---

Summary of changes:
 Modules/FindImageMagick.cmake |4 ++--
 Source/cmGlobalXCodeGenerator.cxx |1 +
 Source/cmQtAutoGenInitializer.cxx |   46 ++---
 3 files changed, 15 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.10.2-1052-g31550eb

[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  31550ebf31a59be391319c2885db46ea8b3a0875 (commit)
   via  210a80f48dd1268c424df137ad08a916147cdd97 (commit)
   via  917852396866933f35cd723318f42290753873ff (commit)
   via  c85ef9c339a9aea5160217e33f917b5d130c9fab (commit)
  from  ab8416776de32e6b6225743721315b8dcbd2d01e (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=31550ebf31a59be391319c2885db46ea8b3a0875
commit 31550ebf31a59be391319c2885db46ea8b3a0875
Merge: 210a80f c85ef9c
Author: Brad King 
AuthorDate: Tue Feb 13 16:12:02 2018 +
Commit: Kitware Robot 
CommitDate: Tue Feb 13 11:12:14 2018 -0500

Merge topic 'autogen-write-on-change-only'

c85ef9c3 Autogen: Overwrite info files when changed only

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=210a80f48dd1268c424df137ad08a916147cdd97
commit 210a80f48dd1268c424df137ad08a916147cdd97
Merge: ab84167 9178523
Author: Brad King 
AuthorDate: Tue Feb 13 16:08:32 2018 +
Commit: Kitware Robot 
CommitDate: Tue Feb 13 11:08:38 2018 -0500

Merge topic 'FindImageMagick-FixFor7.0.x'

91785239 FindImageMagick: Add 7.0 library names

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=917852396866933f35cd723318f42290753873ff
commit 917852396866933f35cd723318f42290753873ff
Author: Roman Wüger 
AuthorDate: Tue Feb 6 20:43:25 2018 +0100
Commit: Brad King 
CommitDate: Tue Feb 6 14:54:33 2018 -0500

FindImageMagick: Add 7.0 library names

For ImageMagick 7.0.x we need to consider `CORE_RL_MagickWand_` and
`CORE_RL_MagickCore_`.

diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index c16bbf2..881bff1 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -206,7 +206,7 @@ foreach(component ${ImageMagick_FIND_COMPONENTS}
 list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
   elseif(component STREQUAL "MagickWand")
 FIND_IMAGEMAGICK_API(MagickWand "wand/MagickWand.h;MagickWand/MagickWand.h"
-  Wand MagickWand CORE_RL_wand_
+  Wand MagickWand CORE_RL_wand_ CORE_RL_MagickWand_
   MagickWand-6 MagickWand-7
   MagickWand-Q16 MagickWand-Q8 MagickWand-Q16HDRI MagickWand-Q8HDRI
   MagickWand-6.Q64 MagickWand-6.Q32 MagickWand-6.Q64HDRI 
MagickWand-6.Q32HDRI
@@ -217,7 +217,7 @@ foreach(component ${ImageMagick_FIND_COMPONENTS}
 list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
   elseif(component STREQUAL "MagickCore")
 FIND_IMAGEMAGICK_API(MagickCore 
"magick/MagickCore.h;MagickCore/MagickCore.h"
-  Magick MagickCore CORE_RL_magick_
+  Magick MagickCore CORE_RL_magick_ CORE_RL_MagickCore_
   MagickCore-6 MagickCore-7
   MagickCore-Q16 MagickCore-Q8 MagickCore-Q16HDRI MagickCore-Q8HDRI
   MagickCore-6.Q64 MagickCore-6.Q32 MagickCore-6.Q64HDRI 
MagickCore-6.Q32HDRI

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c85ef9c339a9aea5160217e33f917b5d130c9fab
commit c85ef9c339a9aea5160217e33f917b5d130c9fab
Author: Sebastian Holtermann 
AuthorDate: Tue Feb 6 14:51:44 2018 +0100
Commit: Brad King 
CommitDate: Tue Feb 6 11:20:08 2018 -0500

Autogen: Overwrite info files when changed only

Check if the content of the AUTOMOC/UIC/RCC info file
will change before overwriting it. This avoids unnecessary
AUTORCC rebuilds when AUTORCC unrelated CMake settings change.

diff --git a/Source/cmQtAutoGenInitializer.cxx 
b/Source/cmQtAutoGenInitializer.cxx
index 41142e5..93c78b5 100644
--- a/Source/cmQtAutoGenInitializer.cxx
+++ b/Source/cmQtAutoGenInitializer.cxx
@@ -8,6 +8,7 @@
 #include "cmCustomCommandLines.h"
 #include "cmDuration.h"
 #include "cmFilePathChecksum.h"
+#include "cmGeneratedFileStream.h"
 #include "cmGeneratorTarget.h"
 #include "cmGlobalGenerator.h"
 #include "cmLinkItem.h"
@@ -22,7 +23,6 @@
 #include "cmStateTypes.h"
 #include "cmSystemTools.h"
 #include "cmTarget.h"
-#include "cm_sys_stat.h"
 #include "cmake.h"
 #include "cmsys/FStream.hxx"
 #include "cmsys/SystemInformation.hxx"
@@ -867,34 +867,6 @@ void cmQtAutoGenInitializer::SetupCustomTargets()
 dir += cfg;
   }
 
-  auto OpenInfoFile = [](cmsys::ofstream& ofs,
- std::string const& fileName) -> bool {
-// Ensure 

[Cmake-commits] CMake branch, master, updated. v3.10.2-1060-g58c6376

[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  58c637643d0e26c345cb8307d51677ae3bda4f05 (commit)
   via  193082a3c803a6418f0f1b5976dc34a91cf30805 (commit)
  from  3b8b379852bbbe3a942834072e4533f2592d00ef (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=58c637643d0e26c345cb8307d51677ae3bda4f05
commit 58c637643d0e26c345cb8307d51677ae3bda4f05
Merge: 3b8b379 193082a
Author: Brad King 
AuthorDate: Tue Feb 13 16:28:22 2018 +
Commit: Kitware Robot 
CommitDate: Tue Feb 13 11:28:31 2018 -0500

Merge topic 'more-misc-typos'

193082a3 MAINT: Misc. typos

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=193082a3c803a6418f0f1b5976dc34a91cf30805
commit 193082a3c803a6418f0f1b5976dc34a91cf30805
Author: luz.paz 
AuthorDate: Thu Feb 8 06:27:21 2018 -0500
Commit: Brad King 
CommitDate: Tue Feb 13 11:24:30 2018 -0500

MAINT: Misc. typos

Found via `codespell -q 3 -I ../cmake-whitelist.txt`.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 0a31ac2..119fc13 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -175,7 +175,7 @@
 #   -- Same as CUDA_ADD_EXECUTABLE except that a library is created.
 #
 #   CUDA_BUILD_CLEAN_TARGET()
-#   -- Creates a convience target that deletes all the dependency files
+#   -- Creates a convenience target that deletes all the dependency files
 #  generated.  You should make clean after running this target to ensure 
the
 #  dependency files get regenerated.
 #
@@ -1564,7 +1564,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
   # Bring in the dependencies.  Creates a variable CUDA_NVCC_DEPEND ###
   cuda_include_nvcc_dependencies(${cmake_dependency_file})
 
-  # Convience string for output ###
+  # Convenience string for output #
   if(CUDA_BUILD_EMULATION)
 set(cuda_build_type "Emulation")
   else()
@@ -1975,9 +1975,9 @@ endmacro()
 ###
 ###
 macro(CUDA_BUILD_CLEAN_TARGET)
-  # Call this after you add all your CUDA targets, and you will get a convience
-  # target.  You should also make clean after running this target to get the
-  # build system to generate all the code again.
+  # Call this after you add all your CUDA targets, and you will get a
+  # convenience target.  You should also make clean after running this target
+  # to get the build system to generate all the code again.
 
   set(cuda_clean_target_name clean_cuda_depends)
   if (CMAKE_GENERATOR MATCHES "Visual Studio")
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 939bd7b..7b138f5 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -36,7 +36,7 @@
 # The default OUTPUT_DIR can also be changed by setting the variable
 # CMAKE_JAVA_TARGET_OUTPUT_DIR.
 #
-# Optionaly, using option GENERATE_NATIVE_HEADERS, native header files can be 
generated
+# Optionally, using option GENERATE_NATIVE_HEADERS, native header files can be 
generated
 # for methods declared as native. These files provide the connective glue that 
allow your
 # Java and C code to interact. An INTERFACE target will be created for an easy 
usage
 # of generated files. Sub-option DESTINATION can be used to specify output 
directory for
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 417cdd2..7069386 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -225,8 +225,8 @@ void cmFindBase::FillCMakeVariablePath()
 {
   cmSearchPath& paths = this->LabeledPaths[PathLabel::CMake];
 
-  // Add CMake varibles of the same name as the previous environment
-  // varibles CMAKE_*_PATH to be used most of the time with -D
+  // Add CMake variables of the same name as the previous environment
+  // variables CMAKE_*_PATH to be used most of the time with -D
   // command line options
   std::string var = "CMAKE_";
   var += this->CMakePathName;
diff --git a/Source/cmQtAutoGeneratorMocUic.cxx 
b/Source/cmQtAutoGeneratorMocUic.cxx
index 6be65ee..37cf0f8 100644
--- a/Source/cmQtAutoGeneratorMocUic.cxx
+++ b/Source/cmQtAutoGeneratorMocUic.cxx
@@ -434,7 +434,7 @@ bool 
cmQtAutoGeneratorMocUic::JobParseT::ParseMocSource(WorkerT& wrk,
 JobHandleT jobHandle(new 

[Cmake-commits] CMake branch, master, updated. v3.10.2-1061-gd870148

[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  d870148537319da2e86237cbd8baf6815975e594 (commit)
  from  58c637643d0e26c345cb8307d51677ae3bda4f05 (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=d870148537319da2e86237cbd8baf6815975e594
commit d870148537319da2e86237cbd8baf6815975e594
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Wed Feb 14 00:01:12 2018 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Feb 14 00:01:12 2018 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index af74da2..c42b5d2 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 11)
-set(CMake_VERSION_PATCH 20180213)
+set(CMake_VERSION_PATCH 20180214)
 #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
https://cmake.org/mailman/listinfo/cmake-commits