[Cmake-commits] CMake branch, master, updated. v3.6.1-466-gd615d20

2016-07-22 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  d615d20a63ce4fae5ada3881f4d154bfc4385fd7 (commit)
  from  8842a501cffe67a665b6fe70956e207193b3f76d (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=d615d20a63ce4fae5ada3881f4d154bfc4385fd7
commit d615d20a63ce4fae5ada3881f4d154bfc4385fd7
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Sat Jul 23 00:01:04 2016 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Sat Jul 23 00:01:04 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 504ef27..47fba45 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 6)
-set(CMake_VERSION_PATCH 20160722)
+set(CMake_VERSION_PATCH 20160723)
 #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 annotated tag, v3.6.1, created. v3.6.1

2016-07-22 Thread Robert Maynard 
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 annotated tag, v3.6.1 has been created
at  25682140a9473569fafeb10c7bbc757c6874b690 (tag)
   tagging  f59513140bf086eda2029c5b4e950fc58216c06e (commit)
  replaces  v3.6.0
 tagged by  Brad King
on  Fri Jul 22 09:29:41 2016 -0400

- Log -
CMake 3.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJXkh/FAAoJEC0s7xA0khaEqxUP/ijSwsbiY7HFp+w3is5AhAFd
SZHEE+pTvFuKrebOw1zpnCo4jU1jGfq9bmQtDhiKOGDhq1a5M18d4qVNmA3Gn/QP
O3z/BxmSQhBTnpsP726NlliQS+/JqkZOICTB00IeXUw0m6TuigdwQ0UDntwedxCh
QSWDf2VJjzM+yBUkpVhtZVEyuWOW52P/OzaGJX9cTV+wrac2uQ/iQ0CmdBPJkUKG
qE+dHt4rJ6zJA25RQwWw183x+rncRrT6ZvsK7L1s6vR+rPpZvfiY69RdCfTREsc4
So3/+XP4jJAsE7J33SeRlurJMJ57N7Cub3TYMdedOrONu8kfyZIm9jqrrjqTsgJ6
mjAHaS9OszTkkp/X68eyUJn/joDGOW61O29tXPfxPiVH3mIP4oPpohRyucaimT4D
q5drcg/+lwPL7Zr++puy47GibWBNHtzewt8BNapkoJDfvSOBuCA6fIgiCzMtogkv
zyfHjsjLcVvETAoDKiNJK5dm3y4hy3MBTUCW2gk3T+lgfiIvwalaULj+0XPgSlG6
06QD9mOd8720JkI3IlFA+IZqrqpSw2QtIwzzm0v1qyjxirl/5AJrsmeAFmAKZWH7
PCVKaexP2HZGYYFkyx75NoC2FUD0m89gTmHcI/+s9NGB5OmJVfPvA+lqHdfsPU03
0Q4AkDoNV308PKM0lyxv
=9lRt
-END PGP SIGNATURE-

Alex Turbov (1):
  CPack/RPM: Add missed CPACK_RPM_FILE_NAME fallback variable

Brad King (14):
  Restore find_(library|file|path) search of PATH itself
  Merge branch 'find-command-restore-PATH-on-unix' into release
  Merge branch 'fix-cpack-rpm-different-package-names' into release
  Merge branch 'FindHDF5-fix-misc-issues' into release
  VS: Fix VS 2015 .vcxproj debug setting for v90 toolset (#15986)
  Merge branch 'vs14-debug-enum-older-toolsets' into release
  Ninja: Do not force response files when no sysconf(3) limit is used
  Merge branch 'ninja-no-accidental-rsp' into release
  CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS value
  Merge branch 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into 
release
  Autogen: Revert changes to generate moc/rcc in subdirectories
  Merge branch 'nsis-protect-uninst-exec' into release
  Merge branch 'revert-autogen-subdirs' into release
  CMake 3.6.1

Chuck Atkins (3):
  FindHDF5: Fix h5cc arg parsing to work with homebrew on Mac
  FindHDF5: Properly fail when required components are not found.
  FindHDF5: Cleanup inconsistent use of HDF5_ROOT

Justin Clift (1):
  NSIS: Quote uninstaller path when executing it in a shell

---


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

[Cmake-commits] CMake branch, release, updated. v3.6.0-19-gf595131

2016-07-22 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, release has been updated
   via  f59513140bf086eda2029c5b4e950fc58216c06e (commit)
  from  f19aca606394a8651dd06ff1e9bca35fec311467 (commit)

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

- Log -
---

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


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-998-g858f96e

2016-07-22 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  858f96eab547ea0970bc087d6d0b77c26f4a377a (commit)
   via  8842a501cffe67a665b6fe70956e207193b3f76d (commit)
  from  2855b6583f0bcb2a5664e45e427e660d82145db3 (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=858f96eab547ea0970bc087d6d0b77c26f4a377a
commit 858f96eab547ea0970bc087d6d0b77c26f4a377a
Merge: 2855b65 8842a50
Author: Brad King 
AuthorDate: Fri Jul 22 10:48:35 2016 -0400
Commit: Brad King 
CommitDate: Fri Jul 22 10:48:35 2016 -0400

Merge branch 'master' into next


---

Summary of changes:


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-996-g2855b65

2016-07-22 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  2855b6583f0bcb2a5664e45e427e660d82145db3 (commit)
   via  624b72159be327505c01f4d68ef6e67ac5f4335e (commit)
  from  3074cb55fc55ac274f387f1855c1e8aeb15a2436 (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=2855b6583f0bcb2a5664e45e427e660d82145db3
commit 2855b6583f0bcb2a5664e45e427e660d82145db3
Merge: 3074cb5 624b721
Author: Brad King 
AuthorDate: Fri Jul 22 10:47:53 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 10:47:53 2016 -0400

Merge topic 'more-virtual-override' into next

624b7215 Source/CPack: Add CM_OVERRIDE on MacOS cmCPackGenerator overrides


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=624b72159be327505c01f4d68ef6e67ac5f4335e
commit 624b72159be327505c01f4d68ef6e67ac5f4335e
Author: Brad King 
AuthorDate: Fri Jul 22 10:42:37 2016 -0400
Commit: Brad King 
CommitDate: Fri Jul 22 10:42:37 2016 -0400

Source/CPack: Add CM_OVERRIDE on MacOS cmCPackGenerator overrides

diff --git a/Source/CPack/cmCPackBundleGenerator.h 
b/Source/CPack/cmCPackBundleGenerator.h
index 9cb2f0a..c6fa408 100644
--- a/Source/CPack/cmCPackBundleGenerator.h
+++ b/Source/CPack/cmCPackBundleGenerator.h
@@ -29,12 +29,12 @@ public:
   virtual ~cmCPackBundleGenerator();
 
 protected:
-  virtual int InitializeInternal();
-  virtual const char* GetPackagingInstallPrefix();
+  int InitializeInternal() CM_OVERRIDE;
+  const char* GetPackagingInstallPrefix() CM_OVERRIDE;
   int ConstructBundle();
   int SignBundle(const std::string& src_dir);
-  int PackageFiles();
-  bool SupportsComponentInstallation() const;
+  int PackageFiles() CM_OVERRIDE;
+  bool SupportsComponentInstallation() const CM_OVERRIDE;
 
   std::string InstallPrefix;
 };
diff --git a/Source/CPack/cmCPackDragNDropGenerator.h 
b/Source/CPack/cmCPackDragNDropGenerator.h
index 1392b21..a5f89f6 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.h
+++ b/Source/CPack/cmCPackDragNDropGenerator.h
@@ -29,17 +29,17 @@ public:
   virtual ~cmCPackDragNDropGenerator();
 
 protected:
-  virtual int InitializeInternal();
-  virtual const char* GetOutputExtension();
-  int PackageFiles();
-  bool SupportsComponentInstallation() const;
+  int InitializeInternal() CM_OVERRIDE;
+  const char* GetOutputExtension() CM_OVERRIDE;
+  int PackageFiles() CM_OVERRIDE;
+  bool SupportsComponentInstallation() const CM_OVERRIDE;
 
   bool CopyFile(std::ostringstream& source, std::ostringstream& target);
   bool CreateEmptyFile(std::ostringstream& target, size_t size);
   bool RunCommand(std::ostringstream& command, std::string* output = 0);
 
   std::string GetComponentInstallDirNameSuffix(
-const std::string& componentName);
+const std::string& componentName) CM_OVERRIDE;
 
   int CreateDMG(const std::string& src_dir, const std::string& output_file);
 
diff --git a/Source/CPack/cmCPackOSXX11Generator.h 
b/Source/CPack/cmCPackOSXX11Generator.h
index adc05d2..d1d6789 100644
--- a/Source/CPack/cmCPackOSXX11Generator.h
+++ b/Source/CPack/cmCPackOSXX11Generator.h
@@ -32,10 +32,10 @@ public:
   virtual ~cmCPackOSXX11Generator();
 
 protected:
-  virtual int InitializeInternal();
-  int PackageFiles();
-  virtual const char* GetPackagingInstallPrefix();
-  virtual const char* GetOutputExtension() { return ".dmg"; }
+  virtual int InitializeInternal() CM_OVERRIDE;
+  int PackageFiles() CM_OVERRIDE;
+  const char* GetPackagingInstallPrefix() CM_OVERRIDE;
+  const char* GetOutputExtension() CM_OVERRIDE { return ".dmg"; }
 
   // bool CopyCreateResourceFile(const std::string& name,
   //const std::string& dir);
diff --git a/Source/CPack/cmCPackPKGGenerator.h 
b/Source/CPack/cmCPackPKGGenerator.h
index 8d10943..d2135cc 100644
--- a/Source/CPack/cmCPackPKGGenerator.h
+++ b/Source/CPack/cmCPackPKGGenerator.h
@@ -33,11 +33,11 @@ public:
   cmCPackPKGGenerator();
   virtual ~cmCPackPKGGenerator();
 
-  virtual bool SupportsComponentInstallation() const;
+  bool SupportsComponentInstallation() const CM_OVERRIDE;
 
 protected:
-  virtual int InitializeInternal();
-  virtual const char* GetOutputPostfix() { return "darwin"; }
+  int InitializeInternal() CM_OVERRIDE;
+  const char* GetOutputPostfix() CM_OVERRIDE { return "darwin"; }
 
   // Copies or creates the resource file with the given name to the
   // package or package staging directory dirName. The variable
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.h 
b/Source/CPack/cmCPackPackageMakerGenerator.h
index

[Cmake-commits] CMake branch, next, updated. v3.6.0-994-g3074cb5

2016-07-22 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  3074cb55fc55ac274f387f1855c1e8aeb15a2436 (commit)
   via  be4e2d8c81a4d3299ed5f748b79cb2a20b1394c8 (commit)
   via  f59513140bf086eda2029c5b4e950fc58216c06e (commit)
  from  6d7ce1c93a510a105a2de202e2d8f562ce62a1b1 (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=3074cb55fc55ac274f387f1855c1e8aeb15a2436
commit 3074cb55fc55ac274f387f1855c1e8aeb15a2436
Merge: 6d7ce1c be4e2d8
Author: Brad King 
AuthorDate: Fri Jul 22 09:27:04 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 09:27:04 2016 -0400

Merge topic 'test-release' into next

be4e2d8c Merge branch 'release' into test-release
f5951314 CMake 3.6.1


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be4e2d8c81a4d3299ed5f748b79cb2a20b1394c8
commit be4e2d8c81a4d3299ed5f748b79cb2a20b1394c8
Merge: 4e88b1e f595131
Author: Brad King 
AuthorDate: Fri Jul 22 09:26:43 2016 -0400
Commit: Brad King 
CommitDate: Fri Jul 22 09:26:43 2016 -0400

Merge branch 'release' into test-release


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f59513140bf086eda2029c5b4e950fc58216c06e
commit f59513140bf086eda2029c5b4e950fc58216c06e
Author: Brad King 
AuthorDate: Fri Jul 22 09:26:11 2016 -0400
Commit: Brad King 
CommitDate: Fri Jul 22 09:26:11 2016 -0400

CMake 3.6.1

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 99ed63b..c1395e5 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 6)
-set(CMake_VERSION_PATCH 0)
+set(CMake_VERSION_PATCH 1)
 #set(CMake_VERSION_RC 0)

---

Summary of changes:


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

[Cmake-commits] CMake branch, master, updated. v3.6.0-482-g4e88b1e

2016-07-22 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  4e88b1ec17fb61399dcf3e7f5f722905899daf27 (commit)
   via  f19aca606394a8651dd06ff1e9bca35fec311467 (commit)
   via  40d5375cf1b55c4eb8043a037c6ad42dc482cc3c (commit)
   via  30dda6724f76c416635cb10341444f617c46600b (commit)
  from  d504999d8656c49138020677d908330125907842 (commit)

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

- Log -
---

Summary of changes:


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-991-g6d7ce1c

2016-07-22 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  6d7ce1c93a510a105a2de202e2d8f562ce62a1b1 (commit)
   via  4e88b1ec17fb61399dcf3e7f5f722905899daf27 (commit)
   via  f19aca606394a8651dd06ff1e9bca35fec311467 (commit)
   via  40d5375cf1b55c4eb8043a037c6ad42dc482cc3c (commit)
   via  30dda6724f76c416635cb10341444f617c46600b (commit)
  from  5eebafdd1a249036204acaa1f4e81bc25ddd (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=6d7ce1c93a510a105a2de202e2d8f562ce62a1b1
commit 6d7ce1c93a510a105a2de202e2d8f562ce62a1b1
Merge: 5eebafd 4e88b1e
Author: Brad King 
AuthorDate: Fri Jul 22 09:23:00 2016 -0400
Commit: Brad King 
CommitDate: Fri Jul 22 09:23:00 2016 -0400

Merge branch 'master' into next


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e88b1ec17fb61399dcf3e7f5f722905899daf27
commit 4e88b1ec17fb61399dcf3e7f5f722905899daf27
Merge: d504999 f19aca6
Author: Brad King 
AuthorDate: Fri Jul 22 09:22:53 2016 -0400
Commit: Brad King 
CommitDate: Fri Jul 22 09:22:53 2016 -0400

Merge branch 'release'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f19aca606394a8651dd06ff1e9bca35fec311467
commit f19aca606394a8651dd06ff1e9bca35fec311467
Merge: 40d5375 5e55d87
Author: Brad King 
AuthorDate: Thu Jul 21 10:08:40 2016 -0400
Commit: Brad King 
CommitDate: Thu Jul 21 10:08:40 2016 -0400

Merge branch 'revert-autogen-subdirs' into release


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40d5375cf1b55c4eb8043a037c6ad42dc482cc3c
commit 40d5375cf1b55c4eb8043a037c6ad42dc482cc3c
Merge: 30dda67 1176873
Author: Brad King 
AuthorDate: Thu Jul 21 10:08:33 2016 -0400
Commit: Brad King 
CommitDate: Thu Jul 21 10:08:33 2016 -0400

Merge branch 'nsis-protect-uninst-exec' into release


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30dda6724f76c416635cb10341444f617c46600b
commit 30dda6724f76c416635cb10341444f617c46600b
Merge: ace12c9 5753499
Author: Brad King 
AuthorDate: Tue Jul 19 10:09:35 2016 -0400
Commit: Brad King 
CommitDate: Tue Jul 19 10:09:35 2016 -0400

Merge branch 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into release


---

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, release, updated. v3.6.0-18-gf19aca6

2016-07-22 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, release has been updated
   via  f19aca606394a8651dd06ff1e9bca35fec311467 (commit)
   via  40d5375cf1b55c4eb8043a037c6ad42dc482cc3c (commit)
   via  11768733d321df55b0efcb70b278c71b8e216cf7 (commit)
   via  5e55d87bdc4d14507fec2bae7a41f3fb9498db1a (commit)
   via  30dda6724f76c416635cb10341444f617c46600b (commit)
   via  57534990d812c49bb2f71f5d36b19fa5e2c005a0 (commit)
  from  ace12c9c158eb2bb649daed699a6d38b7aa2ca6e (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:
 Help/release/3.6.rst   |6 ++
 Modules/NSIS.template.in   |2 +-
 Source/CPack/cmCPackGenerator.cxx  |3 +-
 Source/cmQtAutoGeneratorInitializer.cxx|  120 +++-
 Source/cmQtAutoGenerators.cxx  |   79 --
 Source/cmQtAutoGenerators.h|5 +-
 Tests/QtAutogen/CMakeLists.txt |4 -
 Tests/QtAutogen/same_name/CMakeLists.txt   |   20 -
 Tests/QtAutogen/same_name/aaa/bbb/data.qrc |6 --
 Tests/QtAutogen/same_name/aaa/bbb/item.cpp |   10 ---
 Tests/QtAutogen/same_name/aaa/bbb/item.hpp |   18 -
 Tests/QtAutogen/same_name/aaa/data.qrc |6 --
 Tests/QtAutogen/same_name/aaa/item.cpp |8 --
 Tests/QtAutogen/same_name/aaa/item.hpp |   16 
 Tests/QtAutogen/same_name/bbb/aaa/data.qrc |6 --
 Tests/QtAutogen/same_name/bbb/aaa/item.cpp |   10 ---
 Tests/QtAutogen/same_name/bbb/aaa/item.hpp |   18 -
 Tests/QtAutogen/same_name/bbb/data.qrc |6 --
 Tests/QtAutogen/same_name/bbb/item.cpp |8 --
 Tests/QtAutogen/same_name/bbb/item.hpp |   16 
 Tests/QtAutogen/same_name/ccc/data.qrc |6 --
 Tests/QtAutogen/same_name/ccc/item.cpp |   23 --
 Tests/QtAutogen/same_name/ccc/item.hpp |   16 
 Tests/QtAutogen/same_name/data.qrc |5 --
 Tests/QtAutogen/same_name/main.cpp |   16 
 25 files changed, 54 insertions(+), 379 deletions(-)
 delete mode 100644 Tests/QtAutogen/same_name/CMakeLists.txt
 delete mode 100644 Tests/QtAutogen/same_name/aaa/bbb/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/aaa/bbb/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/aaa/bbb/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/aaa/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/aaa/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/aaa/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/bbb/aaa/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/bbb/aaa/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/bbb/aaa/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/bbb/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/bbb/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/bbb/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/ccc/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/ccc/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/ccc/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/main.cpp


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-986-g5eebafd

2016-07-22 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  5eebafdd1a249036204acaa1f4e81bc25ddd (commit)
   via  d504999d8656c49138020677d908330125907842 (commit)
   via  1fc340f0d4d9450d82631c876ab0f85bae220242 (commit)
   via  3e7689ec392e6e22f60f9568181629077f74c4b6 (commit)
   via  4c61e40cc59e176a175529ad73598b36690f3299 (commit)
   via  19ccd354730a6f9eeb70fa586c9b8bc4d32b3a07 (commit)
   via  e09518ca50177d1dd0e1e156f481cd51562a394b (commit)
  from  6125cb89387ad20437bdb658bbd1f507a017ab5d (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=5eebafdd1a249036204acaa1f4e81bc25ddd
commit 5eebafdd1a249036204acaa1f4e81bc25ddd
Merge: 6125cb8 d504999
Author: Brad King 
AuthorDate: Fri Jul 22 09:18:06 2016 -0400
Commit: Brad King 
CommitDate: Fri Jul 22 09:18:06 2016 -0400

Merge branch 'master' into next


---

Summary of changes:


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

[Cmake-commits] CMake branch, master, updated. v3.6.0-476-g1fc340f

2016-07-22 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  1fc340f0d4d9450d82631c876ab0f85bae220242 (commit)
   via  13a6ff31becea16d567b23abc68bfa8aa75365ce (commit)
  from  3e7689ec392e6e22f60f9568181629077f74c4b6 (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=1fc340f0d4d9450d82631c876ab0f85bae220242
commit 1fc340f0d4d9450d82631c876ab0f85bae220242
Merge: 3e7689e 13a6ff3
Author: Brad King 
AuthorDate: Fri Jul 22 09:17:48 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 09:17:48 2016 -0400

Merge topic 'windows-export-all-fix-objlib'

13a6ff31 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for object libraries


---

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx  |7 +++
 Tests/RunCMake/AutoExportDll/AutoExport.cmake |4 +++-
 Tests/RunCMake/AutoExportDll/objlib.c |4 
 Tests/RunCMake/AutoExportDll/say.cxx  |2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 Tests/RunCMake/AutoExportDll/objlib.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.6.0-478-gd504999

2016-07-22 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  d504999d8656c49138020677d908330125907842 (commit)
   via  d6a6024e9eb993d94d24bb0d98f966c50079a525 (commit)
  from  1fc340f0d4d9450d82631c876ab0f85bae220242 (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=d504999d8656c49138020677d908330125907842
commit d504999d8656c49138020677d908330125907842
Merge: 1fc340f d6a6024
Author: Brad King 
AuthorDate: Fri Jul 22 09:17:53 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 09:17:53 2016 -0400

Merge topic 'tests-hide-ldd-check-errors'

d6a6024e Tests: Hide errors from `ldd --help` output check


---

Summary of changes:
 Tests/RunCMake/CMakeLists.txt |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.6.0-470-g19ccd35

2016-07-22 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  19ccd354730a6f9eeb70fa586c9b8bc4d32b3a07 (commit)
   via  5e55d87bdc4d14507fec2bae7a41f3fb9498db1a (commit)
  from  e09518ca50177d1dd0e1e156f481cd51562a394b (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=19ccd354730a6f9eeb70fa586c9b8bc4d32b3a07
commit 19ccd354730a6f9eeb70fa586c9b8bc4d32b3a07
Merge: e09518c 5e55d87
Author: Brad King 
AuthorDate: Fri Jul 22 09:17:28 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 09:17:28 2016 -0400

Merge topic 'revert-autogen-subdirs'

5e55d87b Autogen: Revert changes to generate moc/rcc in subdirectories


---

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx|  120 +++-
 Source/cmQtAutoGenerators.cxx  |   79 --
 Source/cmQtAutoGenerators.h|5 +-
 Tests/QtAutogen/CMakeLists.txt |4 -
 Tests/QtAutogen/same_name/CMakeLists.txt   |   20 -
 Tests/QtAutogen/same_name/aaa/bbb/data.qrc |6 --
 Tests/QtAutogen/same_name/aaa/bbb/item.cpp |   10 ---
 Tests/QtAutogen/same_name/aaa/bbb/item.hpp |   18 -
 Tests/QtAutogen/same_name/aaa/data.qrc |6 --
 Tests/QtAutogen/same_name/aaa/item.cpp |8 --
 Tests/QtAutogen/same_name/aaa/item.hpp |   16 
 Tests/QtAutogen/same_name/bbb/aaa/data.qrc |6 --
 Tests/QtAutogen/same_name/bbb/aaa/item.cpp |   10 ---
 Tests/QtAutogen/same_name/bbb/aaa/item.hpp |   18 -
 Tests/QtAutogen/same_name/bbb/data.qrc |6 --
 Tests/QtAutogen/same_name/bbb/item.cpp |8 --
 Tests/QtAutogen/same_name/bbb/item.hpp |   16 
 Tests/QtAutogen/same_name/ccc/data.qrc |6 --
 Tests/QtAutogen/same_name/ccc/item.cpp |   23 --
 Tests/QtAutogen/same_name/ccc/item.hpp |   16 
 Tests/QtAutogen/same_name/data.qrc |5 --
 Tests/QtAutogen/same_name/main.cpp |   16 
 22 files changed, 45 insertions(+), 377 deletions(-)
 delete mode 100644 Tests/QtAutogen/same_name/CMakeLists.txt
 delete mode 100644 Tests/QtAutogen/same_name/aaa/bbb/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/aaa/bbb/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/aaa/bbb/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/aaa/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/aaa/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/aaa/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/bbb/aaa/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/bbb/aaa/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/bbb/aaa/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/bbb/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/bbb/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/bbb/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/ccc/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/ccc/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/ccc/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/main.cpp


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

[Cmake-commits] CMake branch, master, updated. v3.6.0-472-g4c61e40

2016-07-22 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  4c61e40cc59e176a175529ad73598b36690f3299 (commit)
   via  059c230d89b2f5c82423fc6458302620f4b09599 (commit)
  from  19ccd354730a6f9eeb70fa586c9b8bc4d32b3a07 (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=4c61e40cc59e176a175529ad73598b36690f3299
commit 4c61e40cc59e176a175529ad73598b36690f3299
Merge: 19ccd35 059c230
Author: Brad King 
AuthorDate: Fri Jul 22 09:17:36 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 09:17:36 2016 -0400

Merge topic 'vs-default-v100'

059c230d VS: Explicitly default to v100 toolset in Visual Studio 2010


---

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


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

[Cmake-commits] CMake branch, master, updated. v3.6.0-468-ge09518c

2016-07-22 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  e09518ca50177d1dd0e1e156f481cd51562a394b (commit)
   via  11768733d321df55b0efcb70b278c71b8e216cf7 (commit)
  from  7bfbcc75a3158677897b2a80b02500425620e714 (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=e09518ca50177d1dd0e1e156f481cd51562a394b
commit e09518ca50177d1dd0e1e156f481cd51562a394b
Merge: 7bfbcc7 1176873
Author: Brad King 
AuthorDate: Fri Jul 22 09:17:19 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 09:17:19 2016 -0400

Merge topic 'nsis-protect-uninst-exec'

11768733 NSIS: Quote uninstaller path when executing it in a shell


---

Summary of changes:
 Help/release/3.6.rst |6 ++
 Modules/NSIS.template.in |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-979-g6125cb8

2016-07-22 Thread Nils Gladitz 
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  6125cb89387ad20437bdb658bbd1f507a017ab5d (commit)
   via  ad453f0502fe5d95ca1f050cdf52c2d32a892988 (commit)
  from  cb6558209baee2c3c9c41c8b3d71d0cd177983c3 (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=6125cb89387ad20437bdb658bbd1f507a017ab5d
commit 6125cb89387ad20437bdb658bbd1f507a017ab5d
Merge: cb65582 ad453f0
Author: Nils Gladitz 
AuthorDate: Fri Jul 22 02:50:15 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 02:50:15 2016 -0400

Merge topic 'wix-disabled-components' into next

ad453f05 CPackWIX: Support CPACK_COMPONENT__DISABLED


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad453f0502fe5d95ca1f050cdf52c2d32a892988
commit ad453f0502fe5d95ca1f050cdf52c2d32a892988
Author: Michael Stürmer 
AuthorDate: Thu Jul 21 16:34:35 2016 +0200
Commit: Nils Gladitz 
CommitDate: Fri Jul 22 08:49:29 2016 +0200

CPackWIX: Support CPACK_COMPONENT__DISABLED

Reviewed-by: Nils Gladitz 

diff --git a/Help/release/dev/wix-disabled-components.rst 
b/Help/release/dev/wix-disabled-components.rst
new file mode 100644
index 000..a7e4d5f
--- /dev/null
+++ b/Help/release/dev/wix-disabled-components.rst
@@ -0,0 +1,6 @@
+wix-disabled-components
+---
+
+* The CPack WIX generator now supports
+  :variable:`CPACK_COMPONENT__DISABLED`.
+  This can be used to deselect a component from being installed by default.
diff --git a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx 
b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx
index 16dd0ab..1747b62 100644
--- a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx
@@ -86,6 +86,10 @@ void cmWIXFeaturesSourceWriter::EmitFeatureForComponent(
 AddAttribute("Display", "hidden");
   }
 
+  if (component.IsDisabledByDefault) {
+AddAttribute("Level", "2");
+  }
+
   EndElement("Feature");
 }
 

---

Summary of changes:


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-977-gcb65582

2016-07-22 Thread Nils Gladitz 
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  cb6558209baee2c3c9c41c8b3d71d0cd177983c3 (commit)
   via  585f2fe0d62c40a68c0a9440372a7062b477c67f (commit)
  from  54f9c388896fb8b9d5054801ac1327de43fe245a (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=cb6558209baee2c3c9c41c8b3d71d0cd177983c3
commit cb6558209baee2c3c9c41c8b3d71d0cd177983c3
Merge: 54f9c38 585f2fe
Author: Nils Gladitz 
AuthorDate: Fri Jul 22 02:48:41 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 02:48:41 2016 -0400

Merge topic 'wix-disabled-components' into next

585f2fe0 CPackWIX: Revise topic release note


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=585f2fe0d62c40a68c0a9440372a7062b477c67f
commit 585f2fe0d62c40a68c0a9440372a7062b477c67f
Author: Nils Gladitz 
AuthorDate: Fri Jul 22 08:48:26 2016 +0200
Commit: Nils Gladitz 
CommitDate: Fri Jul 22 08:48:26 2016 +0200

CPackWIX: Revise topic release note

diff --git a/Help/release/dev/wix-disabled-components.rst 
b/Help/release/dev/wix-disabled-components.rst
index ac37bc7..a7e4d5f 100644
--- a/Help/release/dev/wix-disabled-components.rst
+++ b/Help/release/dev/wix-disabled-components.rst
@@ -1,5 +1,6 @@
 wix-disabled-components
 ---
 
-* The CPack WIX generator now supports CPACK_COMPONENT__DISABLED.
+* The CPack WIX generator now supports
+  :variable:`CPACK_COMPONENT__DISABLED`.
   This can be used to deselect a component from being installed by default.

---

Summary of changes:
 Help/release/dev/wix-disabled-components.rst |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.6.0-975-g54f9c38

2016-07-22 Thread Nils Gladitz 
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  54f9c388896fb8b9d5054801ac1327de43fe245a (commit)
   via  93f61c33346611db0f83529a8901bea84195f277 (commit)
   via  6f108f84d08a4cc12ef5bafc93d5aad903ba687a (commit)
  from  48ce4c6d0c7b1b5bab33a4722a63d1116a22f84d (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=54f9c388896fb8b9d5054801ac1327de43fe245a
commit 54f9c388896fb8b9d5054801ac1327de43fe245a
Merge: 48ce4c6 93f61c3
Author: Nils Gladitz 
AuthorDate: Fri Jul 22 02:41:38 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 02:41:38 2016 -0400

Merge topic 'wix-disabled-components' into next

93f61c33 CPackWIX: Support CPACK_COMPONENT__DISABLED
6f108f84 CPackComponent: Document the *_HIDDEN and *_DISABLED variables


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93f61c33346611db0f83529a8901bea84195f277
commit 93f61c33346611db0f83529a8901bea84195f277
Author: Michael Stürmer 
AuthorDate: Thu Jul 21 16:34:35 2016 +0200
Commit: Nils Gladitz 
CommitDate: Fri Jul 22 08:41:22 2016 +0200

CPackWIX: Support CPACK_COMPONENT__DISABLED

Reviewed-by: Nils Gladitz 

diff --git a/Help/release/dev/wix-disabled-components.rst 
b/Help/release/dev/wix-disabled-components.rst
new file mode 100644
index 000..ac37bc7
--- /dev/null
+++ b/Help/release/dev/wix-disabled-components.rst
@@ -0,0 +1,5 @@
+wix-disabled-components
+---
+
+* The CPack WIX generator now supports CPACK_COMPONENT__DISABLED.
+  This can be used to deselect a component from being installed by default.
diff --git a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx 
b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx
index 16dd0ab..1747b62 100644
--- a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx
@@ -86,6 +86,10 @@ void cmWIXFeaturesSourceWriter::EmitFeatureForComponent(
 AddAttribute("Display", "hidden");
   }
 
+  if (component.IsDisabledByDefault) {
+AddAttribute("Level", "2");
+  }
+
   EndElement("Feature");
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f108f84d08a4cc12ef5bafc93d5aad903ba687a
commit 6f108f84d08a4cc12ef5bafc93d5aad903ba687a
Author: Nils Gladitz 
AuthorDate: Fri Jul 22 08:37:29 2016 +0200
Commit: Nils Gladitz 
CommitDate: Fri Jul 22 08:41:22 2016 +0200

CPackComponent: Document the *_HIDDEN and *_DISABLED variables

diff --git a/Modules/CPackComponent.cmake b/Modules/CPackComponent.cmake
index 6a33086..25d7d61 100644
--- a/Modules/CPackComponent.cmake
+++ b/Modules/CPackComponent.cmake
@@ -75,9 +75,17 @@
 #
 #  The dependencies (list of components) on which this component depends.
 #
+# .. variable:: CPACK_COMPONENT__HIDDEN
+#
+#  True if this component is hidden from the user.
+#
 # .. variable:: CPACK_COMPONENT__REQUIRED
 #
-#  True is this component is required.
+#  True if this component is required.
+#
+# .. variable:: CPACK_COMPONENT__DISABLED
+#
+#  True if this component is not selected to be installed by default.
 #
 # .. command:: cpack_add_component
 #

---

Summary of changes:


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-972-g48ce4c6

2016-07-22 Thread Nils Gladitz 
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  48ce4c6d0c7b1b5bab33a4722a63d1116a22f84d (commit)
   via  a8bc5771cce91e8bb9ccff9aa82039dd60245ac3 (commit)
  from  fc0ef29399c7a03fc5ec11289826e9392a0bb803 (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=48ce4c6d0c7b1b5bab33a4722a63d1116a22f84d
commit 48ce4c6d0c7b1b5bab33a4722a63d1116a22f84d
Merge: fc0ef29 a8bc577
Author: Nils Gladitz 
AuthorDate: Fri Jul 22 02:41:09 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 02:41:09 2016 -0400

Merge topic 'wix-disabled-components' into next

a8bc5771 CPackComponent: Document the *_HIDDEN and *_DISABLED variables


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8bc5771cce91e8bb9ccff9aa82039dd60245ac3
commit a8bc5771cce91e8bb9ccff9aa82039dd60245ac3
Author: Nils Gladitz 
AuthorDate: Fri Jul 22 08:37:29 2016 +0200
Commit: Nils Gladitz 
CommitDate: Fri Jul 22 08:40:16 2016 +0200

CPackComponent: Document the *_HIDDEN and *_DISABLED variables

diff --git a/Modules/CPackComponent.cmake b/Modules/CPackComponent.cmake
index 6a33086..25d7d61 100644
--- a/Modules/CPackComponent.cmake
+++ b/Modules/CPackComponent.cmake
@@ -75,9 +75,17 @@
 #
 #  The dependencies (list of components) on which this component depends.
 #
+# .. variable:: CPACK_COMPONENT__HIDDEN
+#
+#  True if this component is hidden from the user.
+#
 # .. variable:: CPACK_COMPONENT__REQUIRED
 #
-#  True is this component is required.
+#  True if this component is required.
+#
+# .. variable:: CPACK_COMPONENT__DISABLED
+#
+#  True if this component is not selected to be installed by default.
 #
 # .. command:: cpack_add_component
 #

---

Summary of changes:
 Modules/CPackComponent.cmake |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-970-gfc0ef29

2016-07-22 Thread 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  fc0ef29399c7a03fc5ec11289826e9392a0bb803 (commit)
   via  f951d0adb4f7ca185804fba530a3dbc9b81f1cc5 (commit)
   via  c63380b1955422d7116f7ea90c238ab8619e9bc4 (commit)
   via  134d5c1f7c82698b79d88ba92a7bd98b81dceaec (commit)
   via  2b909c08f526536d4dd84dfe68edf22682ae88ca (commit)
   via  7bfbcc75a3158677897b2a80b02500425620e714 (commit)
  from  e4b2afdb3f87ee54d3d1b16724ccbc1efbcb22c7 (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=fc0ef29399c7a03fc5ec11289826e9392a0bb803
commit fc0ef29399c7a03fc5ec11289826e9392a0bb803
Merge: e4b2afd f951d0a
Author: Gregor Jasny 
AuthorDate: Fri Jul 22 02:21:47 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 02:21:47 2016 -0400

Merge topic 'app-framework-bundle-extension' into next

f951d0ad Add tests for BUNDLE_EXTENSION
c63380b1 Update documentation about bundle extensions
134d5c1f Honor BUNDLE_EXTENSION also for Frameworks (#14742)
2b909c08 Honor BUNDLE_EXTENSION also for App Bundles (#16148)
7bfbcc75 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f951d0adb4f7ca185804fba530a3dbc9b81f1cc5
commit f951d0adb4f7ca185804fba530a3dbc9b81f1cc5
Author: Gregor Jasny 
AuthorDate: Mon Jul 18 09:11:44 2016 -0700
Commit: Gregor Jasny 
CommitDate: Thu Jul 21 23:18:56 2016 -0700

Add tests for BUNDLE_EXTENSION

diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake 
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index b77d5d4..0684d57 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -31,13 +31,16 @@ if(NOT XCODE_VERSION VERSION_LESS 5)
 
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesOSX-build)
   set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_OPTIONS "-DTEST_IOS=OFF")
+  set(RunCMake_TEST_OPTIONS
+"-DTEST_IOS=OFF"
+"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install")
 
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
 
   run_cmake(XcodeBundles)
   run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+  run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target 
install)
 
   unset(RunCMake_TEST_BINARY_DIR)
   unset(RunCMake_TEST_NO_CLEAN)
@@ -45,13 +48,16 @@ if(NOT XCODE_VERSION VERSION_LESS 5)
 
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesIOS-build)
   set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_OPTIONS "-DTEST_IOS=ON")
+  set(RunCMake_TEST_OPTIONS
+"-DTEST_IOS=ON"
+"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install")
 
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
 
   run_cmake(XcodeBundles)
   run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+  run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target 
install)
 
   unset(RunCMake_TEST_BINARY_DIR)
   unset(RunCMake_TEST_NO_CLEAN)
@@ -61,13 +67,16 @@ endif()
 if(NOT XCODE_VERSION VERSION_LESS 7)
   set(RunCMake_TEST_BINARY_DIR 
${RunCMake_BINARY_DIR}/XcodeBundlesWatchOS-build)
   set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_OPTIONS "-DTEST_WATCHOS=ON")
+  set(RunCMake_TEST_OPTIONS
+"-DTEST_WATCHOS=ON"
+"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install")
 
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
 
   run_cmake(XcodeBundles)
   run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+  run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target 
install)
 
   unset(RunCMake_TEST_BINARY_DIR)
   unset(RunCMake_TEST_NO_CLEAN)
@@ -77,13 +86,16 @@ endif()
 if(NOT XCODE_VERSION VERSION_LESS 7.1)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesTvOS-build)
   set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_OPTIONS "-DTEST_TVOS=ON")
+  set(RunCMake_TEST_OPTIONS
+"-DTEST_TVOS=ON"
+"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install")
 
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
 
   run_cmake(XcodeBundles)
   run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+  run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target 
install)
 
   unset(RunCMake_TEST_BINARY_DIR)