mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-05 14:06:27 -05:00
Merge bitcoin/bitcoin#31361: cmake, qt: Use absolute paths for includes in MOC-generated files
6f4128e3a8
cmake, qt: Use absolute paths for includes in MOC-generated files (Hennadii Stepanov) Pull request description: Fixes https://github.com/bitcoin/bitcoin/issues/31145. From the `moc --help` output: ``` -p <path> Path prefix for included file. ``` ACKs for top commit: laanwj: Tested ACK6f4128e3a8
willcl-ark: tACK6f4128e3a8
TheCharlatan: ACK6f4128e3a8
BrandonOdiwuor: ACK6f4128e3a8
Tree-SHA512: f313698dec8976a7e0b3f26e6fd34ec041c253ccd75bdc0d7b272c3f786d77e83c35bc4607112960c65a378ec139f30a5187ce74498dce8b99a7349994846dee
This commit is contained in:
commit
da4f4fac8d
2 changed files with 3 additions and 0 deletions
|
@ -35,6 +35,7 @@ endfunction()
|
|||
# - https://doc.qt.io/qt-5/cmake-manual.html
|
||||
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTOMOC_MOC_OPTIONS "-p${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
set(CMAKE_AUTORCC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTOUIC_SEARCH_PATHS forms)
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
# Distributed under the MIT software license, see the accompanying
|
||||
# file COPYING or https://opensource.org/license/mit/.
|
||||
|
||||
set(CMAKE_AUTOMOC_MOC_OPTIONS "-p${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
add_executable(test_bitcoin-qt
|
||||
apptests.cpp
|
||||
optiontests.cpp
|
||||
|
|
Loading…
Add table
Reference in a new issue