[Pkg-cmake-commits] [cmake] 01/03: New upstream version 3.9.5

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository cmake.

commit ca584f4bd5389eee12cac1788c9c966401220cc8
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Nov 4 09:27:03 2017 +0100

    New upstream version 3.9.5
---
 Modules/FindBoost.cmake       | 2 --
 Source/CMakeVersion.cmake     | 2 +-
 Source/cmQtAutoGenerators.cxx | 3 ---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 552ecbf..6d7cc27 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -240,8 +240,6 @@ if (NOT Boost_NO_BOOST_CMAKE)
       message("Found Boost components:")
       message("   ${Boost_FIND_COMPONENTS}")
     endif()
-    # Restore project's policies
-    cmake_policy(POP)
     return()
   endif()
 endif()
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index a627902..cf7efe0 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 9)
-set(CMake_VERSION_PATCH 3)
+set(CMake_VERSION_PATCH 5)
 #set(CMake_VERSION_RC 0)
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index d12d96d..c3ecb51 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1268,9 +1268,6 @@ bool cmQtAutoGenerators::MocGenerateAll(
              it != this->MocDefinitions.end(); ++it) {
           cmd.push_back("-D" + (*it));
         }
-        // Add options
-        cmd.insert(cmd.end(), this->MocOptions.begin(),
-                   this->MocOptions.end());
         // Execute command
         if (!this->RunCommand(cmd, output, false)) {
           {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cmake/cmake.git