From 8575dd25d33aff37d155f0724f69e0adfa84d42e Mon Sep 17 00:00:00 2001 From: Youssef BEDDAD Date: Sat, 21 May 2022 20:30:14 +0100 Subject: [PATCH] Update: - added missing lrchartaxiseditor to CMakeLists.txt to fix LRDesigner and demo_r1 builds - added -qt${QT_VERSION_MAJOR} to demo_r1 and LRDesigner CMakeLists.txt project files --- CMakeLists.txt | 3 +++ demo_r1/CMakeLists.txt | 2 +- designer/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6257b8c..9874801 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,6 +80,7 @@ ${PROJECT_NAME}/items/editors/lrtextalignmenteditorwidget.cpp ${PROJECT_NAME}/items/lrabstractlayout.cpp ${PROJECT_NAME}/items/lralignpropitem.cpp ${PROJECT_NAME}/items/lrchartitem.cpp +${PROJECT_NAME}/items/lrchartaxiseditor.cpp ${PROJECT_NAME}/items/lrchartitemeditor.cpp ${PROJECT_NAME}/items/lrhorizontallayout.cpp ${PROJECT_NAME}/items/lrimageitem.cpp @@ -191,6 +192,7 @@ ${PROJECT_NAME}/items/editors/lrtextalignmenteditorwidget.h ${PROJECT_NAME}/items/lrabstractlayout.h ${PROJECT_NAME}/items/lralignpropitem.h ${PROJECT_NAME}/items/lrchartitem.h +${PROJECT_NAME}/items/lrchartaxiseditor.h ${PROJECT_NAME}/items/lrchartitemeditor.h ${PROJECT_NAME}/items/lreditableimageitemintf.h ${PROJECT_NAME}/items/lrhorizontallayout.h @@ -287,6 +289,7 @@ ${PROJECT_NAME}/databrowser/lrsqleditdialog.ui ${PROJECT_NAME}/databrowser/lrvariabledialog.ui ${PROJECT_NAME}/dialogdesigner/templates/Dialog.ui ${PROJECT_NAME}/items/lrchartitemeditor.ui +${PROJECT_NAME}/items/lrchartaxiseditor.ui ${PROJECT_NAME}/items/lrimageitemeditor.ui ${PROJECT_NAME}/items/lrtextitemeditor.ui ${PROJECT_NAME}/lraboutdialog.ui diff --git a/demo_r1/CMakeLists.txt b/demo_r1/CMakeLists.txt index a694da1..da749ac 100644 --- a/demo_r1/CMakeLists.txt +++ b/demo_r1/CMakeLists.txt @@ -18,6 +18,6 @@ target_link_libraries(demo_r1 PRIVATE Qt${QT_VERSION_MAJOR}::PrintSupport Qt${QT_VERSION_MAJOR}::Qml Qt${QT_VERSION_MAJOR}::Sql - ${PROJECT_NAME} + ${PROJECT_NAME}-qt${QT_VERSION_MAJOR} ) diff --git a/designer/CMakeLists.txt b/designer/CMakeLists.txt index cad7b86..d63ea0b 100644 --- a/designer/CMakeLists.txt +++ b/designer/CMakeLists.txt @@ -16,5 +16,5 @@ target_link_libraries(LRDesigner PUBLIC Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::PrintSupport Qt${QT_VERSION_MAJOR}::Qml - ${PROJECT_NAME} + ${PROJECT_NAME}-qt${QT_VERSION_MAJOR} )