diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 04d23c6b1..28d2bee2e 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -83,6 +83,7 @@ include_directories( ${COMPANION_SRC_DIRECTORY}/storage ${COMPANION_SRC_DIRECTORY}/flash ${COMPANION_SRC_DIRECTORY}/progress + ${COMPANION_SRC_DIRECTORY}/print ) ############# Do macro replacements on input files ############# @@ -202,6 +203,7 @@ add_subdirectory(firmwares) add_subdirectory(flash) add_subdirectory(generaledit) add_subdirectory(modeledit) +add_subdirectory(print) add_subdirectory(progress) add_subdirectory(shared) add_subdirectory(simulation) @@ -216,18 +218,13 @@ include_directories(${maxLibQt_SOURCE_DIR}/widgets) set(companion_NAMES apppreferencesdialog - comparedialog helpers_html labels logsdialog mainwindow mdichild - modelprinter modelslist - multimodelprinter - printdialog profilechooser - styleeditdialog dialogs/filesyncdialog ) @@ -268,6 +265,7 @@ target_link_libraries(${COMPANION_NAME} PRIVATE updates flash wizard + print ) PrintTargetReport("${COMPANION_NAME}") diff --git a/companion/src/print/CMakeLists.txt b/companion/src/print/CMakeLists.txt new file mode 100644 index 000000000..c60529b97 --- /dev/null +++ b/companion/src/print/CMakeLists.txt @@ -0,0 +1,33 @@ + +project(print) + +set(${PROJECT_NAME}_NAMES + comparedialog + modelprinter + multimodelprinter + printdialog + styleeditdialog +) + +AddHeadersSources() + +qt_wrap_cpp(${PROJECT_NAME}_SRCS +) + +add_library(${PROJECT_NAME} + ${${PROJECT_NAME}_HDRS} + ${${PROJECT_NAME}_SRCS} +) + +target_link_libraries(${PROJECT_NAME} + PRIVATE + ${CPN_COMMON_LIB} +) + +target_include_directories(${PROJECT_NAME} + PRIVATE + "${CMAKE_SOURCE_DIR}" + "${CMAKE_CURRENT_BINARY_DIR}" + PUBLIC + "${CMAKE_CURRENT_LIST_DIR}" +) diff --git a/companion/src/comparedialog.cpp b/companion/src/print/comparedialog.cpp similarity index 100% rename from companion/src/comparedialog.cpp rename to companion/src/print/comparedialog.cpp diff --git a/companion/src/comparedialog.h b/companion/src/print/comparedialog.h similarity index 100% rename from companion/src/comparedialog.h rename to companion/src/print/comparedialog.h diff --git a/companion/src/comparedialog.ui b/companion/src/print/comparedialog.ui similarity index 100% rename from companion/src/comparedialog.ui rename to companion/src/print/comparedialog.ui diff --git a/companion/src/modelprinter.cpp b/companion/src/print/modelprinter.cpp similarity index 100% rename from companion/src/modelprinter.cpp rename to companion/src/print/modelprinter.cpp diff --git a/companion/src/modelprinter.h b/companion/src/print/modelprinter.h similarity index 100% rename from companion/src/modelprinter.h rename to companion/src/print/modelprinter.h diff --git a/companion/src/multimodelprinter.cpp b/companion/src/print/multimodelprinter.cpp similarity index 100% rename from companion/src/multimodelprinter.cpp rename to companion/src/print/multimodelprinter.cpp diff --git a/companion/src/multimodelprinter.h b/companion/src/print/multimodelprinter.h similarity index 100% rename from companion/src/multimodelprinter.h rename to companion/src/print/multimodelprinter.h diff --git a/companion/src/printdialog.cpp b/companion/src/print/printdialog.cpp similarity index 100% rename from companion/src/printdialog.cpp rename to companion/src/print/printdialog.cpp diff --git a/companion/src/printdialog.h b/companion/src/print/printdialog.h similarity index 100% rename from companion/src/printdialog.h rename to companion/src/print/printdialog.h diff --git a/companion/src/printdialog.ui b/companion/src/print/printdialog.ui similarity index 100% rename from companion/src/printdialog.ui rename to companion/src/print/printdialog.ui diff --git a/companion/src/styleeditdialog.cpp b/companion/src/print/styleeditdialog.cpp similarity index 100% rename from companion/src/styleeditdialog.cpp rename to companion/src/print/styleeditdialog.cpp diff --git a/companion/src/styleeditdialog.h b/companion/src/print/styleeditdialog.h similarity index 100% rename from companion/src/styleeditdialog.h rename to companion/src/print/styleeditdialog.h diff --git a/companion/src/styleeditdialog.ui b/companion/src/print/styleeditdialog.ui similarity index 100% rename from companion/src/styleeditdialog.ui rename to companion/src/print/styleeditdialog.ui