[Cmake-commits] CMake branch, master, updated. v3.6.1-594-g5aabfec

2016-08-09 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  5aabfec9308bb8b85f19077c2514a0c34f1dbb87 (commit)
  from  4689d16e8aa90e57a8456357251b6575131529d7 (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=5aabfec9308bb8b85f19077c2514a0c34f1dbb87
commit 5aabfec9308bb8b85f19077c2514a0c34f1dbb87
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Wed Aug 10 00:01:04 2016 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Aug 10 00:01:04 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 55a9958..f354b57 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 20160809)
+set(CMake_VERSION_PATCH 20160810)
 #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.6.1-1207-g1b020c5

2016-08-09 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  1b020c5d0ce1085199bf3d68654ee02eb401d5ac (commit)
   via  677e73cb8a7c6f3e598375cb4ff29a24e43a1492 (commit)
  from  8bbcf863e5d24a91a371ee9dec87381d6e09da9f (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=1b020c5d0ce1085199bf3d68654ee02eb401d5ac
commit 1b020c5d0ce1085199bf3d68654ee02eb401d5ac
Merge: 8bbcf86 677e73c
Author: Brad King 
AuthorDate: Tue Aug 9 16:00:47 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 16:00:47 2016 -0400

Merge topic 'fix-test-macOS-case-sensitive' into next

677e73cb Tests: Fix RunCMake.Framework on case sensitive file systems.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=677e73cb8a7c6f3e598375cb4ff29a24e43a1492
commit 677e73cb8a7c6f3e598375cb4ff29a24e43a1492
Author: Chaoren Lin 
AuthorDate: Tue Aug 9 12:47:06 2016 -0700
Commit: Brad King 
CommitDate: Tue Aug 9 16:00:27 2016 -0400

Tests: Fix RunCMake.Framework on case sensitive file systems.

The file is lowercase: Tests/RunCMake/Framework/osx.cmake

diff --git a/Tests/RunCMake/Framework/RunCMakeTest.cmake 
b/Tests/RunCMake/Framework/RunCMakeTest.cmake
index d810283..eeea6f1 100644
--- a/Tests/RunCMake/Framework/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Framework/RunCMakeTest.cmake
@@ -20,7 +20,7 @@ unset(RunCMake_TEST_OPTIONS)
 
 set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/OSXFrameworkLayout-build)
 set(RunCMake_TEST_NO_CLEAN 1)
-set(RunCMake_TEST_OPTIONS 
"-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/OSX.cmake")
+set(RunCMake_TEST_OPTIONS 
"-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/osx.cmake")
 
 file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
 file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")

---

Summary of changes:
 Tests/RunCMake/Framework/RunCMakeTest.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.1-1205-g8bbcf86

2016-08-09 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  8bbcf863e5d24a91a371ee9dec87381d6e09da9f (commit)
   via  93ac2a78d5e0dbb6607105cc8d2a3f19ebdd8583 (commit)
  from  c0566538859b568a58f23eabe12e49ff2370a140 (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=8bbcf863e5d24a91a371ee9dec87381d6e09da9f
commit 8bbcf863e5d24a91a371ee9dec87381d6e09da9f
Merge: c056653 93ac2a7
Author: Gregor Jasny 
AuthorDate: Tue Aug 9 15:25:55 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 15:25:55 2016 -0400

Merge topic '15687-xcode-support-system-include' into next

93ac2a78 Xcode: Obey SYSTEM keyword for includes (#15687)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93ac2a78d5e0dbb6607105cc8d2a3f19ebdd8583
commit 93ac2a78d5e0dbb6607105cc8d2a3f19ebdd8583
Author: Gregor Jasny 
AuthorDate: Mon Aug 31 22:33:37 2015 +0200
Commit: Gregor Jasny 
CommitDate: Tue Aug 9 20:30:07 2016 +0200

Xcode: Obey SYSTEM keyword for includes (#15687)

CMake used to put all header search paths into HEADER_SEARCH_PATHS
attribute. Unfortunately this attribute does not support to declare
a search path as a system include.

As a hack one could add a -isystem /path to the cflags but then include
ordering is not deterministic. A better approach was chosen with this
patch by not filling HEADER_SEARCH_PATHS at all and to populate
the C, C++, and Fortran flags directly. The include paths used by
Xcode should be now identical to the ones used by Unix Makefiles and
Ninja generator.

diff --git a/Modules/CMakeSwiftInformation.cmake 
b/Modules/CMakeSwiftInformation.cmake
index 61ad928..85d3143 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -13,6 +13,7 @@
 #  License text for the above reference.)
 
 set(CMAKE_Swift_OUTPUT_EXTENSION .o)
+set(CMAKE_INCLUDE_FLAG_Swift "-I")
 
 # Load compiler-specific information.
 if(CMAKE_Swift_COMPILER_ID)
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index b396ea1..780ca90 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1907,23 +1907,40 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
 
   BuildObjectListOrString dirs(this, this->XcodeVersion >= 30);
   BuildObjectListOrString fdirs(this, this->XcodeVersion >= 30);
-  std::vector includes;
-  this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, "C",
- configName);
   std::set emitted;
   emitted.insert("/System/Library/Frameworks");
-  for (std::vector::iterator i = includes.begin();
-   i != includes.end(); ++i) {
-if (this->NameResolvesToFramework(i->c_str())) {
-  std::string frameworkDir = *i;
-  frameworkDir += "/../";
-  frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir);
-  if (emitted.insert(frameworkDir).second) {
-fdirs.Add(this->XCodeEscapePath(frameworkDir));
+
+  if (this->XcodeVersion < 60) {
+std::vector includes;
+this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, "C",
+   configName);
+for (std::vector::iterator i = includes.begin();
+ i != includes.end(); ++i) {
+  if (this->NameResolvesToFramework(i->c_str())) {
+std::string frameworkDir = *i;
+frameworkDir += "/../";
+frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir);
+if (emitted.insert(frameworkDir).second) {
+  fdirs.Add(this->XCodeEscapePath(frameworkDir));
+}
+  } else {
+std::string incpath = this->XCodeEscapePath(*i);
+dirs.Add(incpath);
+  }
+}
+  } else {
+for (std::set::iterator li = languages.begin();
+ li != languages.end(); ++li) {
+  std::vector includes;
+  this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, *li,
+ configName);
+  std::string includeFlags = this->CurrentLocalGenerator->GetIncludeFlags(
+includes, gtgt, *li, true, false, configName);
+
+  std::string& flags = cflags[*li];
+  if (!includeFlags.empty()) {
+flags += " " + includeFlags;
   }
-} else {
-  std::string incpath = this->XCodeEscapePath(*i);
-  dirs.Add(incpath);
 }
   }
   // Add framework search paths needed for linking.
@@ -2008,6 +2025,9 @@ void

[Cmake-commits] CMake branch, next, updated. v3.6.1-1203-gc056653

2016-08-09 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  c0566538859b568a58f23eabe12e49ff2370a140 (commit)
   via  0278989405eea53ca7e5f1bfa6af9aea7a0b49c5 (commit)
   via  a88c99f1bc301276a1780fec683d5061ca13f66f (commit)
  from  a15e3696ff5b80792bc6de10a27b1826735f1825 (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=c0566538859b568a58f23eabe12e49ff2370a140
commit c0566538859b568a58f23eabe12e49ff2370a140
Merge: a15e369 0278989
Author: Brad King 
AuthorDate: Tue Aug 9 15:15:59 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 15:15:59 2016 -0400

Merge topic 'ninja-directory-targets' into next

02789894 Ninja: Add `$subdir/{test,install,package}` targets
a88c99f1 Ninja: Simplify computation of GLOBAL_TARGET outputs


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0278989405eea53ca7e5f1bfa6af9aea7a0b49c5
commit 0278989405eea53ca7e5f1bfa6af9aea7a0b49c5
Author: Brad King 
AuthorDate: Fri Aug 5 15:55:32 2016 -0400
Commit: Brad King 
CommitDate: Tue Aug 9 15:15:24 2016 -0400

Ninja: Add `$subdir/{test,install,package}` targets

With the Makefile generator one can use `cd $subdir; make install` to build 
and
install targets associated with a given subdirectory.  This is not possible 
to
do with the Ninja generator since there is only one `build.ninja` file at 
the
top of the build tree.  However, we can approximate it by allowing one to 
run
`ninja $subdir/install` at the top of the tree to build the targets in the
corresponding subdirectory and install them.

This also makes sense for `test`, `package`, and other GLOBAL_TARGET 
targets.
It was already done for `all` by commit v3.6.0-rc1~240^2~2 (Ninja: Add
`$subdir/all` targets, 2016-03-11).

diff --git a/Help/generator/Ninja.rst b/Help/generator/Ninja.rst
index d94e5f6..ef0e28b 100644
--- a/Help/generator/Ninja.rst
+++ b/Help/generator/Ninja.rst
@@ -7,6 +7,17 @@ A build.ninja file is generated into the build tree.  Recent 
versions
 of the ninja program can build the project through the "all" target.
 An "install" target is also provided.
 
-For each subdirectory ``sub/dir`` of the project an additional target
-named ``sub/dir/all`` is generated that depends on all targets required
-by that subdirectory.
+For each subdirectory ``sub/dir`` of the project, additional targets
+are generated:
+
+``sub/dir/all``
+  Depends on all targets required by the subdirectory.
+
+``sub/dir/install``
+  Runs the install step in the subdirectory, if any.
+
+``sub/dir/test``
+  Runs the test step in the subdirectory, if any.
+
+``sub/dir/package``
+  Runs the package step in the subdirectory, if any.
diff --git a/Help/release/dev/ninja-directory-targets.rst 
b/Help/release/dev/ninja-directory-targets.rst
new file mode 100644
index 000..c4269d8
--- /dev/null
+++ b/Help/release/dev/ninja-directory-targets.rst
@@ -0,0 +1,8 @@
+ninja-directory-targets
+---
+
+* The :generator:`Ninja` generator learned to produce phony targets
+  of the form ``sub/dir/{test,install,package}`` to drive the build
+  of a subdirectory installation, test or packaging target.
+  This is equivalent to ``cd sub/dir; make {test,install,package}``
+  with :ref:`Makefile Generators`.
diff --git a/Source/cmGlobalNinjaGenerator.cxx 
b/Source/cmGlobalNinjaGenerator.cxx
index afd43b8..3b8aaa6 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -885,10 +885,15 @@ void cmGlobalNinjaGenerator::AppendTargetDepends(
   cmGeneratorTarget const* target, cmNinjaDeps& outputs)
 {
   if (target->GetType() == cmState::GLOBAL_TARGET) {
-// Global targets only depend on other utilities, which may not appear in
-// the TargetDepends set (e.g. "all").
+// These depend only on other CMake-provided targets, e.g. "all".
 std::set const& utils = target->GetUtilities();
-std::copy(utils.begin(), utils.end(), std::back_inserter(outputs));
+for (std::set::const_iterator i = utils.begin();
+ i != utils.end(); ++i) {
+  std::string d =
+target->GetLocalGenerator()->GetCurrentBinaryDirectory() +
+std::string("/") + *i;
+  outputs.push_back(this->ConvertToNinjaPath(d));
+}
   } else {
 cmNinjaDeps outs;
 cmTargetDependSet const& targetDeps = this->GetTargetDirectDepends(target);
diff --git a/Source/cmNinjaTargetGenerator.cxx 
b/Source/cmNinjaTargetGenerator.cxx
index 1466f8a..9030e05 100644
---

[Cmake-commits] CMake branch, next, updated. v3.6.1-1200-ga15e369

2016-08-09 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  a15e3696ff5b80792bc6de10a27b1826735f1825 (commit)
   via  e9c984267e5539b798a2b1af8431e5715f261cfd (commit)
  from  0ed4b78da380e9c0f2ed5c2489863bfe47124c09 (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=a15e3696ff5b80792bc6de10a27b1826735f1825
commit a15e3696ff5b80792bc6de10a27b1826735f1825
Merge: 0ed4b78 e9c9842
Author: Brad King 
AuthorDate: Tue Aug 9 11:22:20 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 11:22:20 2016 -0400

Merge topic 'NAG-Fortran-no-fPIE' into next

e9c98426 NAG: Use -PIC for Fortran position-independent executable code


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9c984267e5539b798a2b1af8431e5715f261cfd
commit e9c984267e5539b798a2b1af8431e5715f261cfd
Author: Neil Carlson 
AuthorDate: Tue Aug 9 11:14:13 2016 -0400
Commit: Brad King 
CommitDate: Tue Aug 9 11:15:14 2016 -0400

NAG: Use -PIC for Fortran position-independent executable code

The Numerical Algorithms Group (NAG) Fortran compiler documents -PIC for
position-independent code and does not have a separate option for PIE.
We added `-PIC` for PIC in commit v2.8.11~174^2 (NAG: Use -PIC for
Fortran position-independent code, 2013-02-18).  Follow up for PIE.

Closes: #16236

diff --git a/Modules/Compiler/NAG-Fortran.cmake 
b/Modules/Compiler/NAG-Fortran.cmake
index 18f141e..39aae18 100644
--- a/Modules/Compiler/NAG-Fortran.cmake
+++ b/Modules/Compiler/NAG-Fortran.cmake
@@ -33,3 +33,4 @@ set(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-PIC")
 set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-fixed")
 set(CMAKE_Fortran_FORMAT_FREE_FLAG "-free")
 set(CMAKE_Fortran_COMPILE_OPTIONS_PIC "-PIC")
+set(CMAKE_Fortran_COMPILE_OPTIONS_PIE "-PIC")

---

Summary of changes:
 Modules/Compiler/NAG-Fortran.cmake |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, next, updated. v3.6.1-1198-g0ed4b78

2016-08-09 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  0ed4b78da380e9c0f2ed5c2489863bfe47124c09 (commit)
   via  c7a319ab057172071bf8fb909c4498ca87b1235a (commit)
  from  1554a1b92f5fbdde852bc08e5e3534e42a914691 (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=0ed4b78da380e9c0f2ed5c2489863bfe47124c09
commit 0ed4b78da380e9c0f2ed5c2489863bfe47124c09
Merge: 1554a1b c7a319a
Author: Brad King 
AuthorDate: Tue Aug 9 10:10:21 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 10:10:21 2016 -0400

Merge topic 'install-export-staging-dir' into next

c7a319ab install(EXPORT): Fix support for mid-length install destinations 
on Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7a319ab057172071bf8fb909c4498ca87b1235a
commit c7a319ab057172071bf8fb909c4498ca87b1235a
Author: Brad King 
AuthorDate: Tue Aug 9 09:53:16 2016 -0400
Commit: Brad King 
CommitDate: Tue Aug 9 10:09:52 2016 -0400

install(EXPORT): Fix support for mid-length install destinations on Windows

The implementation of `install(EXPORT)` generates files into a staging
directory for later installation.  We use the full install destination
in the path to the staging directory to avoid collisions.  In order to
avoid exceeding maximum path lengths (especially on Windows) we compute
a hash of the install destination when it is too long.  Fix this logic
to account for the length of the file name(s) when deciding whether to
switch to the hashed name.

Reported-by: Alan W. Irwin 

diff --git a/Source/cmInstallExportGenerator.cxx 
b/Source/cmInstallExportGenerator.cxx
index 6250012..0fcd8ba 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -74,9 +74,12 @@ void cmInstallExportGenerator::ComputeTempDir()
 #else
   std::string::size_type const max_total_len = 1000;
 #endif
-  if (this->TempDir.size() < max_total_len) {
+  // Will generate files of the form "/-.".
+  std::string::size_type const len = this->TempDir.size() + 1 +
+this->FileName.size() + 1 + this->GetMaxConfigLength();
+  if (len < max_total_len) {
 // Keep the total path length below the limit.
-std::string::size_type max_len = max_total_len - this->TempDir.size();
+std::string::size_type const max_len = max_total_len - len;
 if (this->Destination.size() > max_len) {
   useMD5 = true;
 }
@@ -102,6 +105,26 @@ void cmInstallExportGenerator::ComputeTempDir()
   }
 }
 
+size_t cmInstallExportGenerator::GetMaxConfigLength() const
+{
+  // Always use at least 8 for "noconfig".
+  size_t len = 8;
+  if (this->ConfigurationTypes->empty()) {
+if (this->ConfigurationName.size() > 8) {
+  len = this->ConfigurationName.size();
+}
+  } else {
+for (std::vector::const_iterator ci =
+   this->ConfigurationTypes->begin();
+ ci != this->ConfigurationTypes->end(); ++ci) {
+  if (ci->size() > len) {
+len = ci->size();
+  }
+}
+  }
+  return len;
+}
+
 void cmInstallExportGenerator::GenerateScript(std::ostream& os)
 {
   // Skip empty sets.
diff --git a/Source/cmInstallExportGenerator.h 
b/Source/cmInstallExportGenerator.h
index 4435f53..22e661b 100644
--- a/Source/cmInstallExportGenerator.h
+++ b/Source/cmInstallExportGenerator.h
@@ -53,6 +53,7 @@ protected:
   void GenerateImportFile(cmExportSet const* exportSet);
   void GenerateImportFile(const char* config, cmExportSet const* exportSet);
   void ComputeTempDir();
+  size_t GetMaxConfigLength() const;
 
   cmExportSet* ExportSet;
   std::string FilePermissions;

---

Summary of changes:
 Source/cmInstallExportGenerator.cxx |   27 +--
 Source/cmInstallExportGenerator.h   |1 +
 2 files changed, 26 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.6.1-1196-g1554a1b

2016-08-09 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  1554a1b92f5fbdde852bc08e5e3534e42a914691 (commit)
   via  02d177c9cc05514baccfa530ab85eec65374fbcb (commit)
  from  daf8cd4836854ba7640edeb629d9049e9f89a8f3 (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=1554a1b92f5fbdde852bc08e5e3534e42a914691
commit 1554a1b92f5fbdde852bc08e5e3534e42a914691
Merge: daf8cd4 02d177c
Author: Brad King 
AuthorDate: Tue Aug 9 09:30:42 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 09:30:42 2016 -0400

Merge topic 'add-extra-boolean-comparisons' into next

02d177c9 Add additional <= and >= comparison operators


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02d177c9cc05514baccfa530ab85eec65374fbcb
commit 02d177c9cc05514baccfa530ab85eec65374fbcb
Author: Chuck Atkins 
AuthorDate: Fri Aug 5 14:11:46 2016 -0400
Commit: Brad King 
CommitDate: Tue Aug 9 09:30:34 2016 -0400

Add additional <= and >= comparison operators

This adds the LESS_EQUAL, GREATER_EQUAL, and associated STR and VERSION
equivalents to use the combined <= and >= functionality.

diff --git a/Help/command/if.rst b/Help/command/if.rst
index 56e618c..0941029 100644
--- a/Help/command/if.rst
+++ b/Help/command/if.rst
@@ -30,10 +30,12 @@ else and endif clause is optional.  Long expressions can be 
used and
 there is a traditional order of precedence.  Parenthetical expressions
 are evaluated first followed by unary tests such as ``EXISTS``,
 ``COMMAND``, and ``DEFINED``.  Then any binary tests such as
-``EQUAL``, ``LESS``, ``GREATER``, ``STRLESS``, ``STRGREATER``,
-``STREQUAL``, and ``MATCHES`` will be evaluated.  Then boolean ``NOT``
-operators and finally boolean ``AND`` and then ``OR`` operators will
-be evaluated.
+``EQUAL``, ``LESS``, ``LESS_EQUAL, ``GREATER``, ``GREATER_EQUAL``,
+``STREQUAL``, ``STRLESS``, ``STRLESS_EQUAL``, ``STRGREATER``,
+``STRGREATER_EQUAL``, ``VERSION_EQUAL``, ``VERSION_LESS``,
+``VERSION_LESS_EQUAL``, ``VERSION_GREATER``, ``VERSION_GREATER_EQUAL``,
+and ``MATCHES`` will be evaluated.  Then boolean ``NOT`` operators and
+finally boolean ``AND`` and then ``OR`` operators will be evaluated.
 
 Possible expressions are:
 
@@ -115,6 +117,14 @@ Possible expressions are:
  True if the given string or variable's value is a valid number and equal
  to that on the right.
 
+``if( LESS_EQUAL )``
+ True if the given string or variable's value is a valid number and less
+ than or equal to that on the right.
+
+``if( GREATER_EQUAL )``
+ True if the given string or variable's value is a valid number and greater
+ than or equal to that on the right.
+
 ``if( STRLESS )``
  True if the given string or variable's value is lexicographically less
  than the string or variable on the right.
@@ -127,15 +137,31 @@ Possible expressions are:
  True if the given string or variable's value is lexicographically equal
  to the string or variable on the right.
 
+``if( STRLESS_EQUAL )``
+ True if the given string or variable's value is lexicographically less
+ than or equal to the string or variable on the right.
+
+``if( STRGREATER_EQUAL )``
+ True if the given string or variable's value is lexicographically greater
+ than or equal to the string or variable on the right.
+
 ``if( VERSION_LESS )``
  Component-wise integer version number comparison (version format is
  ``major[.minor[.patch[.tweak]]]``).
 
+``if( VERSION_GREATER )``
+ Component-wise integer version number comparison (version format is
+ ``major[.minor[.patch[.tweak]]]``).
+
 ``if( VERSION_EQUAL )``
  Component-wise integer version number comparison (version format is
  ``major[.minor[.patch[.tweak]]]``).
 
-``if( VERSION_GREATER )``
+``if( VERSION_LESS_EQUAL )``
+ Component-wise integer version number comparison (version format is
+ ``major[.minor[.patch[.tweak]]]``).
+
+``if( VERSION_GREATER_EQUAL )``
  Component-wise integer version number comparison (version format is
  ``major[.minor[.patch[.tweak]]]``).
 
@@ -186,20 +212,21 @@ above-documented signature accepts ````:
 * If the left hand argument to ``MATCHES`` is missing it returns false
   without error
 
-*

[Cmake-commits] CMake branch, next, updated. v3.6.1-1194-gdaf8cd4

2016-08-09 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  daf8cd4836854ba7640edeb629d9049e9f89a8f3 (commit)
   via  f38a17f8898caca1019d5b1952760315bab7aeca (commit)
   via  62a18526df331e96c3e3e5a3fc4dcaec24657f80 (commit)
  from  abfa2025ae10de25d5135b6ad010750c0addd3f7 (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=daf8cd4836854ba7640edeb629d9049e9f89a8f3
commit daf8cd4836854ba7640edeb629d9049e9f89a8f3
Merge: abfa202 f38a17f
Author: Brad King 
AuthorDate: Tue Aug 9 09:30:27 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 09:30:27 2016 -0400

Merge topic 'add-extra-boolean-comparisons' into next

f38a17f8 fixup! Add additional <= and >= comparison operators
62a18526 fixup! Add additional <= and >= comparison operators


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f38a17f8898caca1019d5b1952760315bab7aeca
commit f38a17f8898caca1019d5b1952760315bab7aeca
Author: Brad King 
AuthorDate: Tue Aug 9 09:24:04 2016 -0400
Commit: Brad King 
CommitDate: Tue Aug 9 09:24:04 2016 -0400

fixup! Add additional <= and >= comparison operators

diff --git a/Help/release/dev/add-extra-boolean-comparisons.rst 
b/Help/release/dev/add-extra-boolean-comparisons.rst
index a69b212..a928994 100644
--- a/Help/release/dev/add-extra-boolean-comparisons.rst
+++ b/Help/release/dev/add-extra-boolean-comparisons.rst
@@ -1,5 +1,6 @@
 add-extra-boolean-comparisons
 -
 
-* Add LESS_EQUAL, GREATER_EQUAL, and thier associated STR and VERSION
-  equivalents to use the combined <= and >= functionality.
+* The :command:`if` command gained new boolean comparison operations
+  ``LESS_EQUAL``, ``GREATER_EQUAL``, ``STRLESS_EQUAL``, ``STRGREATER_EQUAL``,
+  ``VERSION_LESS_EQUAL``, and ``VERSION_GREATER_EQUAL``.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62a18526df331e96c3e3e5a3fc4dcaec24657f80
commit 62a18526df331e96c3e3e5a3fc4dcaec24657f80
Author: Brad King 
AuthorDate: Tue Aug 9 09:21:32 2016 -0400
Commit: Brad King 
CommitDate: Tue Aug 9 09:21:32 2016 -0400

fixup! Add additional <= and >= comparison operators

diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 141a00e..8a856a8 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -366,9 +366,8 @@ bool cmCTest::ShouldCompressTestOutput()
   if (!this->ComputedCompressTestOutput) {
 std::string cdashVersion = this->GetCDashVersion();
 // version >= 1.6?
-bool cdashSupportsGzip =
-  cmSystemTools::VersionCompare(cmSystemTools::OP_GREATER_EQUAL,
-cdashVersion.c_str(), "1.6");
+bool cdashSupportsGzip = cmSystemTools::VersionCompare(
+  cmSystemTools::OP_GREATER_EQUAL, cdashVersion.c_str(), "1.6");
 this->CompressTestOutput &= cdashSupportsGzip;
 this->ComputedCompressTestOutput = true;
   }
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 705fc7d..3c913ee 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -484,9 +484,9 @@ bool cmStringCommand::HandleCompareCommand(
 return false;
   }
   std::string mode = args[1];
-  if ((mode == "EQUAL") || (mode == "NOTEQUAL") ||
-  (mode == "LESS") || (mode == "LESS_EQUAL") ||
-  (mode == "GREATER") || (mode == "GREATER_EQUAL")) {
+  if ((mode == "EQUAL") || (mode == "NOTEQUAL") || (mode == "LESS") ||
+  (mode == "LESS_EQUAL") || (mode == "GREATER") ||
+  (mode == "GREATER_EQUAL")) {
 if (args.size() < 5) {
   std::string e = "sub-command COMPARE, mode ";
   e += mode;
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index f031273..d0a28e1 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -284,10 +284,10 @@ public:
 
   enum CompareOp
   {
-OP_EQUAL   = 1,
-OP_LESS= 2,
+OP_EQUAL = 1,
+OP_LESS = 2,
 OP_GREATER = 4,
-OP_LESS_EQUAL= OP_LESS | OP_EQUAL,
+OP_LESS_EQUAL = OP_LESS | OP_EQUAL,
 OP_GREATER_EQUAL = OP_GREATER | OP_EQUAL
   };
 
diff --git a/Tests/Complex/Executable/complex.cxx 
b/Tests/Complex/Executable/complex.cxx
index f335d67..3b09229 100644
--- a/Tests/Complex/Executable/complex.cxx
+++ b/Tests/Complex/Executable/complex.cxx
@@ -509,7 +509,8 @@ int main()
 #endif
 
 #ifdef SHOULD_NOT_BE_DEFINED_LESS_EQUAL
-  cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_LESS_EQUAL is 
defined.");
+  cmFailed(
+"IF or SET is broken, SHOULD_NOT_BE_DEFINED_LESS_EQUAL is defined.");
 #else

[Cmake-commits] CMake branch, next, updated. v3.6.1-1191-gabfa202

2016-08-09 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  abfa2025ae10de25d5135b6ad010750c0addd3f7 (commit)
   via  4689d16e8aa90e57a8456357251b6575131529d7 (commit)
   via  a5b73e719a744a75be6ccf149360b14aaebbb273 (commit)
   via  a8c819659be76426804abc28bb6221a2dc3bf333 (commit)
   via  892ffe4ebd5ca0fd36255671efe37edc9448b470 (commit)
   via  982b4cd602fc125c9d2165145100d5e574644bf9 (commit)
  from  81666a6fb2567c8f71649db3c45ac00bdc7287ca (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=abfa2025ae10de25d5135b6ad010750c0addd3f7
commit abfa2025ae10de25d5135b6ad010750c0addd3f7
Merge: 81666a6 4689d16
Author: Brad King 
AuthorDate: Tue Aug 9 09:20:30 2016 -0400
Commit: Brad King 
CommitDate: Tue Aug 9 09:20:30 2016 -0400

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.6.1-588-ga8c8196

2016-08-09 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  a8c819659be76426804abc28bb6221a2dc3bf333 (commit)
   via  955c2a630aae9b925b468e98e7c323384d943cb0 (commit)
  from  892ffe4ebd5ca0fd36255671efe37edc9448b470 (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=a8c819659be76426804abc28bb6221a2dc3bf333
commit a8c819659be76426804abc28bb6221a2dc3bf333
Merge: 892ffe4 955c2a6
Author: Brad King 
AuthorDate: Tue Aug 9 09:20:15 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 09:20:15 2016 -0400

Merge topic 'ninja-full-path'

955c2a63 Ninja: Use full path for all source files


---

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


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

[Cmake-commits] CMake branch, master, updated. v3.6.1-590-ga5b73e7

2016-08-09 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  a5b73e719a744a75be6ccf149360b14aaebbb273 (commit)
   via  5f3c8f6ab2c6633bdbfc083b9e96b477c1700c80 (commit)
  from  a8c819659be76426804abc28bb6221a2dc3bf333 (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=a5b73e719a744a75be6ccf149360b14aaebbb273
commit a5b73e719a744a75be6ccf149360b14aaebbb273
Merge: a8c8196 5f3c8f6
Author: Brad King 
AuthorDate: Tue Aug 9 09:20:18 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 09:20:18 2016 -0400

Merge topic 'GetPrerequisites-grep-a'

5f3c8f6a GetPrerequisites: Always filter objdump output as text


---

Summary of changes:
 Modules/GetPrerequisites.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.6.1-586-g892ffe4

2016-08-09 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  892ffe4ebd5ca0fd36255671efe37edc9448b470 (commit)
   via  17bbf6af1ecca15194a693d31fdd8163aacfd994 (commit)
  from  982b4cd602fc125c9d2165145100d5e574644bf9 (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=892ffe4ebd5ca0fd36255671efe37edc9448b470
commit 892ffe4ebd5ca0fd36255671efe37edc9448b470
Merge: 982b4cd 17bbf6a
Author: Brad King 
AuthorDate: Tue Aug 9 09:20:13 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 09:20:13 2016 -0400

Merge topic 'wix-custom-install-dir'

17bbf6af CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER feature


---

Summary of changes:
 Help/release/dev/wix-custom-install-dir.rst   |7 +++
 Modules/CPackWIX.cmake|   17 +
 Source/CPack/WiX/cmCPackWIXGenerator.cxx  |9 +
 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx |   10 +++---
 Source/CPack/WiX/cmWIXFilesSourceWriter.cxx   |   14 +-
 Source/CPack/WiX/cmWIXFilesSourceWriter.h |2 ++
 6 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 Help/release/dev/wix-custom-install-dir.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.6.1-593-g4689d16

2016-08-09 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  4689d16e8aa90e57a8456357251b6575131529d7 (commit)
   via  551b4c90626357ee9b6048e89c7406f3b4063fbb (commit)
   via  3a7be4f3943e160b1c0c144d914d3dd2ba42819e (commit)
  from  a5b73e719a744a75be6ccf149360b14aaebbb273 (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=4689d16e8aa90e57a8456357251b6575131529d7
commit 4689d16e8aa90e57a8456357251b6575131529d7
Merge: a5b73e7 551b4c9
Author: Brad King 
AuthorDate: Tue Aug 9 09:20:21 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 09:20:21 2016 -0400

Merge topic 'fix-string-append'

551b4c90 Revert the use of string(APPEND) in .cmake.in files
3a7be4f3 prefer list(APPEND) over string(APPEND) where appropriate


---

Summary of changes:
 Modules/BasicConfigVersion-AnyNewerVersion.cmake.in  |2 +-
 Modules/BasicConfigVersion-ExactVersion.cmake.in |2 +-
 Modules/BasicConfigVersion-SameMajorVersion.cmake.in |2 +-
 Modules/ExternalProject.cmake|2 +-
 Modules/FindQt4.cmake|2 +-
 Tests/RunCMake/CPack/VerifyResult.cmake  |4 ++--
 Tests/SimpleInstall/CMakeLists.txt   |4 ++--
 Tests/SimpleInstallS2/CMakeLists.txt |4 ++--
 8 files changed, 11 insertions(+), 11 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.6.1-1185-g81666a6

2016-08-09 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  81666a6fb2567c8f71649db3c45ac00bdc7287ca (commit)
   via  f692f66d492eca3a4f28a6fd496c9e3e859538d0 (commit)
   via  04b220a713c10791a2e576d620f7189421ca5749 (commit)
   via  c84623b72dae79f9bf61d7e31b0d851e65a9ff1d (commit)
   via  4b4bafda73b0f7221498153e7bed69b9d44e7982 (commit)
   via  096d0ba6919cf78b127408cf5bb5b5404a77bb80 (commit)
  from  56bac0ae7c1e982e995546e8458a0f73b0f477b5 (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=81666a6fb2567c8f71649db3c45ac00bdc7287ca
commit 81666a6fb2567c8f71649db3c45ac00bdc7287ca
Merge: 56bac0a f692f66
Author: Brad King 
AuthorDate: Tue Aug 9 09:16:00 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 09:16:00 2016 -0400

Merge topic 'autogen-same-name' into next

f692f66d Tests/QtAutogen: Test same moc/qrc source names in different 
directories
04b220a7 QtAutogen: Allow multiple qrc files with the same name
c84623b7 QtAutogen: Allow multiple moc files with the same name
4b4bafda QtAutogen: Use std:: instead of ::std::
096d0ba6 cmFilePathUuid: Add class to generate deterministic unique file 
names


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f692f66d492eca3a4f28a6fd496c9e3e859538d0
commit f692f66d492eca3a4f28a6fd496c9e3e859538d0
Author: Sebastian Holtermann 
AuthorDate: Sat Aug 6 15:22:54 2016 +0200
Commit: Brad King 
CommitDate: Tue Aug 9 09:14:38 2016 -0400

Tests/QtAutogen: Test same moc/qrc source names in different directories

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index d5aca55..e35e1d1 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -110,6 +110,10 @@ set_target_properties(
   AUTOMOC TRUE
 )
 
+# Test AUTOMOC and AUTORCC on source files with the same name
+# but in different subdirectories
+add_subdirectory(sameName)
+
 include(GenerateExportHeader)
 # The order is relevant here. B depends on A, and B headers depend on A
 # headers both subdirectories use CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE and we
diff --git a/Tests/QtAutogen/sameName/CMakeLists.txt 
b/Tests/QtAutogen/sameName/CMakeLists.txt
new file mode 100644
index 000..ed045fb
--- /dev/null
+++ b/Tests/QtAutogen/sameName/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Test AUTOMOC and AUTORCC on source files with the same name
+# but in different subdirectories
+
+add_executable(sameName
+  aaa/bbb/item.cpp
+  aaa/bbb/data.qrc
+  aaa/item.cpp
+  aaa/data.qrc
+  bbb/aaa/item.cpp
+  bbb/aaa/data.qrc
+  bbb/item.cpp
+  bbb/data.qrc
+  ccc/item.cpp
+  ccc/data.qrc
+  item.cpp
+  data.qrc
+  main.cpp
+)
+target_include_directories(sameName PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(sameName ${QT_LIBRARIES})
+set_target_properties( sameName PROPERTIES AUTOMOC TRUE AUTORCC TRUE )
diff --git a/Tests/QtAutogen/sameName/aaa/bbb/data.qrc 
b/Tests/QtAutogen/sameName/aaa/bbb/data.qrc
new file mode 100644
index 000..0ea3537
--- /dev/null
+++ b/Tests/QtAutogen/sameName/aaa/bbb/data.qrc
@@ -0,0 +1,6 @@
+
+
+  item.hpp
+  item.cpp
+
+
diff --git a/Tests/QtAutogen/sameName/aaa/bbb/item.cpp 
b/Tests/QtAutogen/sameName/aaa/bbb/item.cpp
new file mode 100644
index 000..20d0044
--- /dev/null
+++ b/Tests/QtAutogen/sameName/aaa/bbb/item.cpp
@@ -0,0 +1,10 @@
+#include "item.hpp"
+
+namespace aaa {
+namespace bbb {
+
+void Item::go()
+{
+}
+}
+}
diff --git a/Tests/QtAutogen/sameName/aaa/bbb/item.hpp 
b/Tests/QtAutogen/sameName/aaa/bbb/item.hpp
new file mode 100644
index 000..0855043
--- /dev/null
+++ b/Tests/QtAutogen/sameName/aaa/bbb/item.hpp
@@ -0,0 +1,18 @@
+#ifndef AAA_BBB_ITEM_HPP
+#define AAA_BBB_ITEM_HPP
+
+#include 
+
+namespace aaa {
+namespace bbb {
+
+class Item : public QObject
+{
+  Q_OBJECT
+  Q_SLOT
+  void go();
+};
+}
+}
+
+#endif
diff --git a/Tests/QtAutogen/sameName/aaa/data.qrc 
b/Tests/QtAutogen/sameName/aaa/data.qrc
new file mode 100644
index 000..379af60
--- /dev/null
+++ b/Tests/QtAutogen/sameName/aaa/data.qrc
@@ -0,0 +1,6 @@
+
+
+  item.hpp
+  item.cpp
+
+
diff --git a/Tests/QtAutogen/sameName/aaa/item.cpp 
b/Tests/QtAutogen/sameName/aaa/item.cpp
new file mode 100644
index 000..95dd3b6
--- /dev/null
+++ b/Tests/QtAutogen/sameName/aaa/item.cpp
@@ -0,0 +1,8 @@
+#include "item.hpp"
+
+namespace aaa {
+
+void Item::go()
+{
+}
+}
diff --git a/Tests/QtAutogen/sameName/aaa/item.hpp 
b/Tests/QtAutogen/sameName/aaa/item.hpp
new file mode 100644
index 000..b63466f
--- /dev/null
+++

[Cmake-commits] CMake branch, next, updated. v3.6.1-1179-g56bac0a

2016-08-09 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  56bac0ae7c1e982e995546e8458a0f73b0f477b5 (commit)
   via  c6da78dfa74d2dbab57535d864d2d1772763d008 (commit)
   via  83273ca5a1d36a6f05695d4c90a9e30c2874a087 (commit)
  from  c9477b66889974bf27c435ef951435a557bfd1b7 (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=56bac0ae7c1e982e995546e8458a0f73b0f477b5
commit 56bac0ae7c1e982e995546e8458a0f73b0f477b5
Merge: c9477b6 c6da78d
Author: Brad King 
AuthorDate: Tue Aug 9 09:15:49 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 09:15:49 2016 -0400

Merge topic 'autogen-same-name' into next

c6da78df fixup! cmFilePathUuid: Add class to generate deterministic unique 
file names
83273ca5 QtAutogen: Replace invalid character for symbol names


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6da78dfa74d2dbab57535d864d2d1772763d008
commit c6da78dfa74d2dbab57535d864d2d1772763d008
Author: Brad King 
AuthorDate: Tue Aug 9 09:14:18 2016 -0400
Commit: Brad King 
CommitDate: Tue Aug 9 09:14:18 2016 -0400

fixup! cmFilePathUuid: Add class to generate deterministic unique file names

diff --git a/Source/cmFilePathUuid.cxx b/Source/cmFilePathUuid.cxx
index e226cdc..592c3a6 100644
--- a/Source/cmFilePathUuid.cxx
+++ b/Source/cmFilePathUuid.cxx
@@ -126,18 +126,18 @@ std::string cmFilePathUuid::GetChecksumString(
   for (unsigned int jj = 0; jj != 2; ++jj) {
 const unsigned char nibble = hexHash[ii * 2 + jj];
 if ('0' <= nibble && nibble <= '9') {
-  hbyte[jj] = nibble - '0';
+  hbyte[jj] = static_cast(nibble - '0');
 } else if ('a' <= nibble && nibble <= 'f') {
-  hbyte[jj] = nibble - 'a' + 10;
+  hbyte[jj] = static_cast(nibble - 'a' + 10);
 } else if ('A' <= nibble && nibble <= 'f') {
-  hbyte[jj] = nibble - 'A' + 10;
+  hbyte[jj] = static_cast(nibble - 'A' + 10);
 } else {
   // Unexpected non hex character
   std::cerr << "Unexpected non hex character in checksum string";
   exit(-1);
 }
   }
-  hashBytes[ii] = hbyte[1] | (hbyte[0] << 4);
+  hashBytes[ii] = static_cast(hbyte[1] | (hbyte[0] << 4));
 }
   }
   // Convert hash bytes to Base64 text string

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83273ca5a1d36a6f05695d4c90a9e30c2874a087
commit 83273ca5a1d36a6f05695d4c90a9e30c2874a087
Author: Sebastian Holtermann 
AuthorDate: Mon Aug 8 20:58:21 2016 +0200
Commit: Brad King 
CommitDate: Tue Aug 9 09:04:40 2016 -0400

QtAutogen: Replace invalid character for symbol names

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 6a95615..a261962 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1331,6 +1331,10 @@ bool cmQtAutoGenerators::GenerateQrc(const std::string& 
qrcInputFile,
 // Remove "qrc_" at string begin
 symbolName.erase(0, 4);
   }
+  // Replace '-' with '_'. The former is valid for
+  // file names but not for symbol names.
+  std::replace(symbolName.begin(), symbolName.end(), '-', '_');
+
   const std::string qrcBuildFile = this->Builddir + qrcOutputFile;
 
   int sourceNewerThanQrc = 0;

---

Summary of changes:
 Source/cmFilePathUuid.cxx |8 
 Source/cmQtAutoGenerators.cxx |4 
 2 files changed, 8 insertions(+), 4 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.6.1-1176-gc9477b6

2016-08-09 Thread Chuck Atkins 
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  c9477b66889974bf27c435ef951435a557bfd1b7 (commit)
   via  55e72872796d6649b17edf4dbca2d2641274c5c4 (commit)
  from  d8a2506da003e45b84c1f8e09960b60037be7434 (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=c9477b66889974bf27c435ef951435a557bfd1b7
commit c9477b66889974bf27c435ef951435a557bfd1b7
Merge: d8a2506 55e7287
Author: Chuck Atkins 
AuthorDate: Tue Aug 9 08:01:14 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 08:01:14 2016 -0400

Merge topic 'add-extra-boolean-comparisons' into next

55e72872 Add additional <= and >= comparison operators


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55e72872796d6649b17edf4dbca2d2641274c5c4
commit 55e72872796d6649b17edf4dbca2d2641274c5c4
Author: Chuck Atkins 
AuthorDate: Fri Aug 5 14:11:46 2016 -0400
Commit: Chuck Atkins 
CommitDate: Tue Aug 9 08:00:25 2016 -0400

Add additional <= and >= comparison operators

This adds the LESS_EQUAL, GREATER_EQUAL, and associated STR and VERSION
equivalents to use the combined <= and >= functionality.

diff --git a/Help/command/if.rst b/Help/command/if.rst
index 56e618c..0941029 100644
--- a/Help/command/if.rst
+++ b/Help/command/if.rst
@@ -30,10 +30,12 @@ else and endif clause is optional.  Long expressions can be 
used and
 there is a traditional order of precedence.  Parenthetical expressions
 are evaluated first followed by unary tests such as ``EXISTS``,
 ``COMMAND``, and ``DEFINED``.  Then any binary tests such as
-``EQUAL``, ``LESS``, ``GREATER``, ``STRLESS``, ``STRGREATER``,
-``STREQUAL``, and ``MATCHES`` will be evaluated.  Then boolean ``NOT``
-operators and finally boolean ``AND`` and then ``OR`` operators will
-be evaluated.
+``EQUAL``, ``LESS``, ``LESS_EQUAL, ``GREATER``, ``GREATER_EQUAL``,
+``STREQUAL``, ``STRLESS``, ``STRLESS_EQUAL``, ``STRGREATER``,
+``STRGREATER_EQUAL``, ``VERSION_EQUAL``, ``VERSION_LESS``,
+``VERSION_LESS_EQUAL``, ``VERSION_GREATER``, ``VERSION_GREATER_EQUAL``,
+and ``MATCHES`` will be evaluated.  Then boolean ``NOT`` operators and
+finally boolean ``AND`` and then ``OR`` operators will be evaluated.
 
 Possible expressions are:
 
@@ -115,6 +117,14 @@ Possible expressions are:
  True if the given string or variable's value is a valid number and equal
  to that on the right.
 
+``if( LESS_EQUAL )``
+ True if the given string or variable's value is a valid number and less
+ than or equal to that on the right.
+
+``if( GREATER_EQUAL )``
+ True if the given string or variable's value is a valid number and greater
+ than or equal to that on the right.
+
 ``if( STRLESS )``
  True if the given string or variable's value is lexicographically less
  than the string or variable on the right.
@@ -127,15 +137,31 @@ Possible expressions are:
  True if the given string or variable's value is lexicographically equal
  to the string or variable on the right.
 
+``if( STRLESS_EQUAL )``
+ True if the given string or variable's value is lexicographically less
+ than or equal to the string or variable on the right.
+
+``if( STRGREATER_EQUAL )``
+ True if the given string or variable's value is lexicographically greater
+ than or equal to the string or variable on the right.
+
 ``if( VERSION_LESS )``
  Component-wise integer version number comparison (version format is
  ``major[.minor[.patch[.tweak]]]``).
 
+``if( VERSION_GREATER )``
+ Component-wise integer version number comparison (version format is
+ ``major[.minor[.patch[.tweak]]]``).
+
 ``if( VERSION_EQUAL )``
  Component-wise integer version number comparison (version format is
  ``major[.minor[.patch[.tweak]]]``).
 
-``if( VERSION_GREATER )``
+``if( VERSION_LESS_EQUAL )``
+ Component-wise integer version number comparison (version format is
+ ``major[.minor[.patch[.tweak]]]``).
+
+``if( VERSION_GREATER_EQUAL )``
  Component-wise integer version number comparison (version format is
  ``major[.minor[.patch[.tweak]]]``).
 
@@ -186,20 +212,21 @@ above-documented signature accepts ````:
 * If the left hand argument to ``MATCHES`` is missing it returns false
   without

[Cmake-commits] CMake branch, next, updated. v3.6.1-1174-gd8a2506

2016-08-09 Thread Chuck Atkins 
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  d8a2506da003e45b84c1f8e09960b60037be7434 (commit)
   via  970eaed46afef12f003b51bdb51f5abf62214b19 (commit)
  from  d20a9735cddbdceda3ee3122711feaab7cb74818 (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=d8a2506da003e45b84c1f8e09960b60037be7434
commit d8a2506da003e45b84c1f8e09960b60037be7434
Merge: d20a973 970eaed
Author: Chuck Atkins 
AuthorDate: Tue Aug 9 08:00:11 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 08:00:11 2016 -0400

Merge topic 'add-extra-boolean-comparisons' into next

970eaed4 Fix documentation warning


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=970eaed46afef12f003b51bdb51f5abf62214b19
commit 970eaed46afef12f003b51bdb51f5abf62214b19
Author: Chuck Atkins 
AuthorDate: Tue Aug 9 07:59:28 2016 -0400
Commit: Chuck Atkins 
CommitDate: Tue Aug 9 07:59:28 2016 -0400

Fix documentation warning

diff --git a/Help/release/dev/add-extra-boolean-comparisons.rst 
b/Help/release/dev/add-extra-boolean-comparisons.rst
index 6a1db01..a69b212 100644
--- a/Help/release/dev/add-extra-boolean-comparisons.rst
+++ b/Help/release/dev/add-extra-boolean-comparisons.rst
@@ -1,5 +1,5 @@
 add-extra-boolean-comparisons
 -
 
-* Add LESS_EQUAL, GREATER_EQUAL, and thier associated STR and VERSION_
+* Add LESS_EQUAL, GREATER_EQUAL, and thier associated STR and VERSION
   equivalents to use the combined <= and >= functionality.

---

Summary of changes:
 Help/release/dev/add-extra-boolean-comparisons.rst |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