Skip to content

Commit e72cb20

Browse files
committed
Merge bitcoin/bitcoin#32943: depends: Force CMAKE_EXPORT_NO_PACKAGE_REGISTRY=TRUE
44f3bae depends: Force `CMAKE_EXPORT_NO_PACKAGE_REGISTRY=TRUE` (Hennadii Stepanov) Pull request description: When using CMake policies 3.14 and below, the `export(PACKAGE)` command by default populates the user package registry, which is stored outside the build tree. Setting the `CMAKE_EXPORT_NO_PACKAGE_REGISTRY` variable disables this side effect. In CMake 3.15 and later, this behavior is disabled by default, and the variable has no effect. This PR forces `CMAKE_EXPORT_NO_PACKAGE_REGISTRY=TRUE` globally, rather than managing it for each dependency package individually rather. It may be reverted once all CMake-based packages have updated to policies 3.15 or newer. Fixes bitcoin/bitcoin#32938. ACKs for top commit: fanquake: ACK 44f3bae Tree-SHA512: 0aac398b7182e80185b064d59f81aece4d8477a609fad9cc3fee317da2aff43b66ef7db1efec0135b4f0feaad23b1db664e33bd035fe659712c5b2a9bf2d6fb6
2 parents 97fb46d + 44f3bae commit e72cb20

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

depends/funcs.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ $(1)_cmake=env CC="$$($(1)_cc)" \
224224
-DCMAKE_INSTALL_LIBDIR=lib/ \
225225
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
226226
-DCMAKE_VERBOSE_MAKEFILE:BOOL=$(V) \
227+
-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY:BOOL=TRUE \
227228
$$($(1)_config_opts)
228229
ifeq ($($(1)_type),build)
229230
$(1)_cmake += -DCMAKE_INSTALL_RPATH:PATH="$$($($(1)_type)_prefix)/lib"

0 commit comments

Comments
 (0)