Skip to content

Commit da4f4fa

Browse files
committed
Merge bitcoin#31361: cmake, qt: Use absolute paths for includes in MOC-generated files
6f4128e cmake, qt: Use absolute paths for includes in MOC-generated files (Hennadii Stepanov) Pull request description: Fixes bitcoin#31145. From the `moc --help` output: ``` -p <path> Path prefix for included file. ``` ACKs for top commit: laanwj: Tested ACK 6f4128e willcl-ark: tACK 6f4128e TheCharlatan: ACK 6f4128e BrandonOdiwuor: ACK 6f4128e Tree-SHA512: f313698dec8976a7e0b3f26e6fd34ec041c253ccd75bdc0d7b272c3f786d77e83c35bc4607112960c65a378ec139f30a5187ce74498dce8b99a7349994846dee
2 parents 097c66f + 6f4128e commit da4f4fa

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

src/qt/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ endfunction()
3535
# - https://doc.qt.io/qt-5/cmake-manual.html
3636

3737
set(CMAKE_AUTOMOC ON)
38+
set(CMAKE_AUTOMOC_MOC_OPTIONS "-p${CMAKE_CURRENT_SOURCE_DIR}")
3839
set(CMAKE_AUTORCC ON)
3940
set(CMAKE_AUTOUIC ON)
4041
set(CMAKE_AUTOUIC_SEARCH_PATHS forms)

src/qt/test/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# Distributed under the MIT software license, see the accompanying
33
# file COPYING or https://opensource.org/license/mit/.
44

5+
set(CMAKE_AUTOMOC_MOC_OPTIONS "-p${CMAKE_CURRENT_SOURCE_DIR}")
6+
57
add_executable(test_bitcoin-qt
68
apptests.cpp
79
optiontests.cpp

0 commit comments

Comments
 (0)