[debhelper-devel] [debhelper] 01/01: cmake: Disable user package registry

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit 3c82881a6bbb3c4467ae6a8b83a9802c3a60f87e
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jul 29 17:25:03 2017 +0000

    cmake: Disable user package registry
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Buildsystem/cmake.pm | 2 ++
 debian/changelog                      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 6060f23..a73cac1 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -17,6 +17,8 @@ my @STANDARD_CMAKE_FLAGS = qw(
   -DCMAKE_BUILD_TYPE=None
   -DCMAKE_INSTALL_SYSCONFDIR=/etc
   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+  -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
+  -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON
 );
 
 my %DEB_HOST2CMAKE_SYSTEM = (
diff --git a/debian/changelog b/debian/changelog
index 61e3f42..a4b01ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ debhelper (10.7) UNRELEASED; urgency=medium
     Adrian Bunk for the suggestion.  (Closes: #868674)
   * cmake.pm: Pass -DCMAKE_INSTALL_RUNSTATEDIR=/run to cmake in compat 11.
     Thanks to Felix Geyer for the suggestion.  (Closes: #869697)
+  * cmake.pm: Avoid using the user specific cmake package registry.  Thanks
+    to Christian Seiler and Felix Geyer.  (Closes: #868584)
 
   [ Colin Watson ]
   * Quote assignment to $recommended_compat in case it isn't a valid Perl

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