Skip to content

Commit

Permalink
Merge #136: cmake: Fix linter warnings
Browse files Browse the repository at this point in the history
399e182 fixup! cmake: Add `Maintenance` module (Hennadii Stepanov)
686fa83 fixup! qt, build: Drop `QT_STATICPLUGIN` macro (Hennadii Stepanov)
88e12af fixup! cmake: Add `GenerateBuildInfo.cmake` script (Hennadii Stepanov)

Pull request description:

ACKs for top commit:
  pablomartin4btc:
    cr ACK 399e182

Tree-SHA512: 769a0b63b5c78436131b5b87561d549b2e28e9376ba4b3a1eab5c4e3e91238797b6a3a01412d8e471dea5fc0fbdffe37b0b16a5a49703218f3f9a904a903a68b
  • Loading branch information
hebasto committed Apr 3, 2024
2 parents 058d6c4 + 399e182 commit a3313e2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cmake/script/GenerateBuildInfo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ macro(fatal_error)
" cmake -D BUILD_INFO_HEADER_PATH=<path> [-D SOURCE_DIR=<path>] -P ${CMAKE_CURRENT_LIST_FILE}\n"
"All specified paths must be absolute ones.\n"
)
endmacro()
endmacro()

if(DEFINED BUILD_INFO_HEADER_PATH AND IS_ABSOLUTE "${BUILD_INFO_HEADER_PATH}")
if(EXISTS "${BUILD_INFO_HEADER_PATH}")
Expand Down
2 changes: 2 additions & 0 deletions cmake/script/macos_zip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit/.

export LC_ALL=C

if [ -n "$SOURCE_DATE_EPOCH" ]; then
find . -exec touch -d "@$SOURCE_DATE_EPOCH" {} +
fi
Expand Down
4 changes: 0 additions & 4 deletions src/qt/guiutil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#if defined(HAVE_CONFIG_H)
#include <config/bitcoin-config.h>
#endif

#include <qt/guiutil.h>

#include <qt/bitcoinaddressvalidator.h>
Expand Down

0 comments on commit a3313e2

Please sign in to comment.