Details

Reviewers

Group Reviewers

Restricted Project

Commits

rSTAGING1187488597aa: [CMAKE] Move .h files transformed from .ui to the form subdirectory
rABC1187488597aa: [CMAKE] Move .h files transformed from .ui to the form subdirectory

Summary

This diff is an alternative to D2750.

This is a prerequisite for PR11651, as all the qt headers will be
included with their path relative to src/.

Example: #include "ui_intro.h will become `#include
<qt/forms/ui_intro.h>`.

The ui_*.h files generated from the *.ui files are generated by
qt5_wrap_ui in the CMakeLists.txt file directory, wherever the
source *.ui files are located.

This diff updates then restores the CMAKE_CURRENT_BINARY_DIR in order
to make CMake behave as if the CMakeLists.txt file was located into
the qt/forms directory.

Test Plan

mkdir buildcmake && cd buildcmake
cmake -GNinja ..
ninja check

Diff Detail

Repository

rABC Bitcoin ABC

Branch

cmake_move_ui_files_forms_rewrite_qtwrapui

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 5414
Build 8890: Bitcoin ABC Buildbot (legacy)
Build 8889: arc lint + arc unit

Event Timeline

Fabien created this revision.Apr 8 2019, 15:32

Herald added a reviewer: Restricted Project. · View Herald TranscriptApr 8 2019, 15:32

Herald added a reviewer: deadalnix. · View Herald Transcript

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B5414: Diff 7993.Apr 8 2019, 15:47

You will end up using the ui generator from the system even when not wanted (for instance for reproducible builds) with that construct.

This revision now requires changes to proceed.Apr 8 2019, 20:05

The Qt5Widgets_UIC_EXECUTABLE variable is set by the find_package(Qt5Widget) which is searching for files according to the CMAKE_FIND_ROOT_PATH.
The platform files override the CMAKE_FIND_ROOT_PATH variable, so that cross compilation and gitian builds should be fine.

deadalnix requested changes to this revision.Apr 10 2019, 22:05

deadalnix added inline comments.

cmake/modules/QtHelper.cmake
37	A simpler option would be to set `CMAKE_CURRENT_BINARY_DIR` and call `QT5_WRAP_UI` instead of duplicating its source code.

This revision now requires changes to proceed.Apr 10 2019, 22:05

Hack the CMAKE_CURRENT_BINARY_DIR variable as suggested.

Fabien edited the summary of this revision. (Show Details)Apr 11 2019, 14:33

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B5438: Diff 8037.Apr 11 2019, 14:48

deadalnix requested changes to this revision.Apr 14 2019, 14:25

deadalnix added inline comments.

src/qt/CMakeLists.txt
81 ↗	(On Diff #8037)	A comment as to why this is necessary would be useful, IMO
82 ↗	(On Diff #8037)	Defining this in term of the current binary dir is the correct thing to do here.