Skip to content

Commit 69b9574

Browse files
author
ikkemaniac
committed
move wizard to subdir per @elecpower 's comment in EdgeTX#6556
1 parent 0f69f1d commit 69b9574

File tree

7 files changed

+40
-3
lines changed

7 files changed

+40
-3
lines changed

companion/src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ add_subdirectory(simulation)
203203
add_subdirectory(storage)
204204
add_subdirectory(thirdparty/qcustomplot)
205205
add_subdirectory(updates)
206+
add_subdirectory(wizard)
206207

207208
############# Companion ###############
208209

@@ -233,8 +234,6 @@ set(companion_NAMES
233234
radionotfound
234235
splashlibrarydialog
235236
styleeditdialog
236-
wizarddata
237-
wizarddialog
238237
dialogs/filesyncdialog
239238
)
240239

@@ -278,6 +277,7 @@ target_link_libraries(${COMPANION_NAME} PRIVATE
278277
qcustomplot
279278
miniz
280279
updates
280+
wizard
281281
)
282282

283283
PrintTargetReport("${COMPANION_NAME}")

companion/src/mdichild.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "printdialog.h"
2828
#include "helpers.h"
2929
#include "appdata.h"
30-
#include "wizarddialog.h"
30+
#include "wizard/wizarddialog.h"
3131
#include "flashfirmwaredialog.h"
3232
#include "storage.h"
3333
#include "radiointerface.h"
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
2+
project(wizard)
3+
4+
set(${PROJECT_NAME}_NAMES
5+
wizarddata
6+
wizarddialog
7+
)
8+
9+
AddHeadersSources()
10+
11+
# AUTOMOC does not detect so manually process
12+
set(${PROJECT_NAME}_MOC
13+
wizarddata.h
14+
wizarddialog.h
15+
)
16+
17+
qt_wrap_cpp(${PROJECT_NAME}_SRCS
18+
${${PROJECT_NAME}_MOC}
19+
)
20+
21+
add_library(${PROJECT_NAME}
22+
${${PROJECT_NAME}_HDRS}
23+
${${PROJECT_NAME}_SRCS}
24+
)
25+
26+
target_link_libraries(${PROJECT_NAME}
27+
PRIVATE
28+
${CPN_COMMON_LIB}
29+
)
30+
31+
target_include_directories(${PROJECT_NAME}
32+
PRIVATE
33+
"${CMAKE_SOURCE_DIR}"
34+
"${CMAKE_CURRENT_BINARY_DIR}"
35+
PUBLIC
36+
"${CMAKE_CURRENT_LIST_DIR}"
37+
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)