Skip to content

Commit 1f054ec

Browse files
committed
cmake: add USE_SOURCE_PERMISSIONS to all configure_file usage
`USE_SOURCE_PERMISSIONS` is the default, so this should not change behaviour. However, being explicit makes it clear what we are doing. Related to #30815. See https://cmake.org/cmake/help/latest/command/configure_file.html#options.
1 parent 0e5cd60 commit 1f054ec

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -458,10 +458,10 @@ else()
458458
)
459459
endif()
460460

461-
configure_file(cmake/script/Coverage.cmake Coverage.cmake COPYONLY)
462-
configure_file(cmake/script/CoverageFuzz.cmake CoverageFuzz.cmake COPYONLY)
463-
configure_file(cmake/script/CoverageInclude.cmake.in CoverageInclude.cmake @ONLY)
464-
configure_file(contrib/filter-lcov.py filter-lcov.py COPYONLY)
461+
configure_file(cmake/script/Coverage.cmake Coverage.cmake USE_SOURCE_PERMISSIONS COPYONLY)
462+
configure_file(cmake/script/CoverageFuzz.cmake CoverageFuzz.cmake USE_SOURCE_PERMISSIONS COPYONLY)
463+
configure_file(cmake/script/CoverageInclude.cmake.in CoverageInclude.cmake USE_SOURCE_PERMISSIONS @ONLY)
464+
configure_file(contrib/filter-lcov.py filter-lcov.py USE_SOURCE_PERMISSIONS COPYONLY)
465465

466466
# Don't allow extended (non-ASCII) symbols in identifiers. This is easier for code review.
467467
try_append_cxx_flags("-fno-extended-identifiers" TARGET core_interface SKIP_LINK)

cmake/module/GenerateSetupNsi.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ function(generate_setup_nsi)
1414
set(BITCOIN_WALLET_TOOL_NAME "bitcoin-wallet")
1515
set(BITCOIN_TEST_NAME "test_bitcoin")
1616
set(EXEEXT ${CMAKE_EXECUTABLE_SUFFIX})
17-
configure_file(${PROJECT_SOURCE_DIR}/share/setup.nsi.in ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.nsi @ONLY)
17+
configure_file(${PROJECT_SOURCE_DIR}/share/setup.nsi.in ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.nsi USE_SOURCE_PERMISSIONS @ONLY)
1818
endfunction()

cmake/module/Maintenance.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ function(add_macos_deploy_target)
9292
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND TARGET bitcoin-qt)
9393
set(macos_app "Bitcoin-Qt.app")
9494
# Populate Contents subdirectory.
95-
configure_file(${PROJECT_SOURCE_DIR}/share/qt/Info.plist.in ${macos_app}/Contents/Info.plist)
95+
configure_file(${PROJECT_SOURCE_DIR}/share/qt/Info.plist.in ${macos_app}/Contents/Info.plist USE_SOURCE_PERMISSIONS)
9696
file(CONFIGURE OUTPUT ${macos_app}/Contents/PkgInfo CONTENT "APPL????")
9797
# Populate Contents/Resources subdirectory.
9898
file(CONFIGURE OUTPUT ${macos_app}/Contents/Resources/empty.lproj CONTENT "")
99-
configure_file(${PROJECT_SOURCE_DIR}/src/qt/res/icons/bitcoin.icns ${macos_app}/Contents/Resources/bitcoin.icns COPYONLY)
99+
configure_file(${PROJECT_SOURCE_DIR}/src/qt/res/icons/bitcoin.icns ${macos_app}/Contents/Resources/bitcoin.icns USE_SOURCE_PERMISSIONS COPYONLY)
100100
file(CONFIGURE OUTPUT ${macos_app}/Contents/Resources/Base.lproj/InfoPlist.strings
101101
CONTENT "{ CFBundleDisplayName = \"@PACKAGE_NAME@\"; CFBundleName = \"@PACKAGE_NAME@\"; }"
102102
)

doc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ find_package(Doxygen COMPONENTS dot)
66

77
if(DOXYGEN_FOUND)
88
set(doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
9-
configure_file(Doxyfile.in ${doxyfile})
9+
configure_file(Doxyfile.in ${doxyfile} USE_SOURCE_PERMISSIONS)
1010

1111
# In CMake 3.27, The FindDoxygen module's doxygen_add_docs()
1212
# command gained a CONFIG_FILE option to specify a custom doxygen

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
include(GNUInstallDirs)
66
include(AddWindowsResources)
77

8-
configure_file(${PROJECT_SOURCE_DIR}/cmake/bitcoin-config.h.in config/bitcoin-config.h @ONLY)
8+
configure_file(${PROJECT_SOURCE_DIR}/cmake/bitcoin-config.h.in config/bitcoin-config.h USE_SOURCE_PERMISSIONS @ONLY)
99
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
1010

1111
# TODO: After the transition from Autotools to CMake, the obj/ subdirectory

src/qt/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ file(GLOB ts_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} locale/*.ts)
4646
set_source_files_properties(${ts_files} PROPERTIES OUTPUT_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/locale)
4747
qt5_add_translation(qm_files ${ts_files})
4848

49-
configure_file(bitcoin_locale.qrc bitcoin_locale.qrc COPYONLY)
49+
configure_file(bitcoin_locale.qrc bitcoin_locale.qrc USE_SOURCE_PERMISSIONS COPYONLY)
5050

5151
# The bitcoinqt sources have to include headers in
5252
# order to parse them to collect translatable strings.

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function(create_test_config)
2727
set_configure_variable(ENABLE_EXTERNAL_SIGNER ENABLE_EXTERNAL_SIGNER)
2828
set_configure_variable(WITH_USDT ENABLE_USDT_TRACEPOINTS)
2929

30-
configure_file(config.ini.in config.ini @ONLY)
30+
configure_file(config.ini.in config.ini USE_SOURCE_PERMISSIONS @ONLY)
3131
endfunction()
3232

3333
create_test_config()

0 commit comments

Comments
 (0)