Differential D6251

[CMAKE] Move the OpenSSL symbol detection to Qt rather than config
ClosedPublic
Actions

Authored by Fabien on May 25 2020, 19:18.

Tags

None

Subscribers

Details

Reviewers

Group Reviewers

Restricted Project

Commits

rABCf5a55e228fe3: [CMAKE] Move the OpenSSL symbol detection to Qt rather than config

Summary

This is a follow-up for the comment
https://reviews.bitcoinabc.org/D6243#inline-39530

The symbol is tightly coupled to OpenSSL, which only use it for BIP70
support in the GUI. This diff moves the check in the GUI where it
belongs and sets a preprocessor definition instead of setting the
definition in the config header.

Test Plan

ninja all check-bitcoin-qt

Cross build for all platforms.

Diff Detail

Repository

rABC Bitcoin ABC

Branch

cmake_move_evp_md_ctx_detection_to_qt

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 11019
Build 20348: Default Diff Build & Tests
Build 20347: Build without Wallet
Build 20346: Build with clang-10
Build 20345: arc lint + arc unit

Event Timeline

Fabien created this revision.May 25 2020, 19:18

Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 25 2020, 19:18

Fabien requested review of this revision.May 25 2020, 19:18

Build Bitcoin ABC Diffs / Diff Testing (build-without-wallet) started.

Build Bitcoin ABC Diffs / Diff Testing (build-werror) started.

Build Bitcoin ABC Diffs / Diff Testing (build-diff) started.

Build Bitcoin ABC Diffs / Diff Testing (build-werror) passed.

Build Bitcoin ABC Diffs / Diff Testing (build-without-wallet) passed.

Fix component

Fabien added a child revision: D6243: [BUILD] Search and include OpenSSL only where required.May 25 2020, 19:22

Build Bitcoin ABC Diffs / Diff Testing (build-werror) started.

Build Bitcoin ABC Diffs / Diff Testing (build-without-wallet) started.

Build Bitcoin ABC Diffs / Diff Testing (build-diff) started.

Build Bitcoin ABC Diffs / Diff Testing (build-werror) passed.

Build Bitcoin ABC Diffs / Diff Testing (build-without-wallet) passed.

Build Bitcoin ABC Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B11018: Diff 20598.May 25 2020, 19:29

Build Bitcoin ABC Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B11019: Diff 20599.May 25 2020, 19:33

You need to fix the cmake file, but this looks good.

src/qt/CMakeLists.txt
260	There is something screwed up with the indentation. It seems like linter that warn about this wouldn't be very difficult to write, but maybe not.

This revision now requires changes to proceed.May 25 2020, 20:14

Fix spaces/tabs mixup

Build Bitcoin ABC Diffs / Diff Testing (build-diff) started.

Build Bitcoin ABC Diffs / Diff Testing (build-werror) started.

Build Bitcoin ABC Diffs / Diff Testing (build-without-wallet) started.

Fabien added inline comments.May 25 2020, 21:00

src/qt/CMakeLists.txt
260	Actually I think there is a cmake linter available, but I never took the time to look into it.

Build Bitcoin ABC Diffs / Diff Testing (build-werror) passed.

Build Bitcoin ABC Diffs / Diff Testing (build-without-wallet) passed.

Build Bitcoin ABC Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B11021: Diff 20603.May 25 2020, 21:10

deadalnix accepted this revision.May 25 2020, 23:25

This revision is now accepted and ready to land.May 25 2020, 23:25

Closed by commit rABCf5a55e228fe3: [CMAKE] Move the OpenSSL symbol detection to Qt rather than config (authored by Fabien). · Explain WhyMay 26 2020, 08:04

This revision was automatically updated to reflect the committed changes.

Fabien added a commit: rABCf5a55e228fe3: [CMAKE] Move the OpenSSL symbol detection to Qt rather than config.

Revision Contents
Changeset List

Path

Size

src/

config/

5 lines

bitcoin-config.h.cmake.in

2 lines

qt/

13 lines

Diff 20599

src/config/CMakeLists.txt

Loading...

src/config/bitcoin-config.h.cmake.in

Loading...

src/qt/CMakeLists.txt

Loading...