Page MenuHomePhabricator

[CMAKE] Fix the bench build for windows
ClosedPublic

Authored by Fabien on Mar 20 2020, 17:00.

Details

Summary

Event requires lib ws2_32 on windows (as well as shell32 and advapi32).
The missing ws2_32 caused the bench to fail the build (shell32 and advapi32 are already added by other dependencies).

Test Plan

Run the Gitian builds.

Diff Detail

Repository
rABC Bitcoin ABC
Branch
cmake_fix_windows_bench
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 9906
Build 17671: Default Diff Build & Tests
Build 17670: arc lint + arc unit

Event Timeline

deadalnix requested changes to this revision.Mar 20 2020, 17:06
deadalnix added a subscriber: deadalnix.

Event requires lib ws2_32 on windows

Well then, why not do that?

This revision now requires changes to proceed.Mar 20 2020, 17:06
Fabien requested review of this revision.Mar 20 2020, 17:21

Because it's not enough, unfortunately. Not only event needs it, but also util for system.cpp:SetupNetworking().

I started to work on a better solution, but a complete fix requires to backport all the wallet/server separation first, which we should do but it's huge.

This fix is simpl and more in line with autotools (which is unaffected). If it is a no-go then I will revert the faulty commit.

deadalnix requested changes to this revision.EditedMar 20 2020, 17:36

If libevent needs ws2_32 on some plateform, then it needs it on some plateforms. This needs to be part of the fix. I don't see how any backport changes this.

This revision now requires changes to proceed.Mar 20 2020, 17:36
Fabien planned changes to this revision.Mar 20 2020, 17:45

For some reason I was focusing on removing the dependency to util at the same time, and that needs to pull more code. Just add adding the event dependency will work for sure.

Link windows lib as a dependency for event.

cmake/modules/FindEvent.cmake
53

Note to reviewers: no need to use a find_library here since they are part of the windows SDK.

This revision is now accepted and ready to land.Mar 20 2020, 19:17
This revision was automatically updated to reflect the committed changes.