python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-10-01 19:51:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #345 from MultiMote/master

Browse Source 
Remove QtScript dependency in CMakeLists
This commit is contained in:
Alexander Arin
2021-09-30 16:53:28 +03:00
committed by GitHub
parent bd357bd9f0 9825ee78c1
commit 5648f68a35
1 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@@ -5,11 +5,11 @@ find_package(PNG REQUIRED)
find_package( find_package(
QT NAMES Qt6 Qt5 QT NAMES Qt6 Qt5
COMPONENTS Core Widgets Sql Network Xml Svg Qml PrintSupport Script UiTools COMPONENTS Core Widgets Sql Network Xml Svg Qml PrintSupport UiTools
) )
find_package( find_package(
Qt${QT_VERSION_MAJOR} Qt${QT_VERSION_MAJOR}
COMPONENTS Core Widgets Sql Network Xml Svg Qml PrintSupport Script UiTools COMPONENTS Core Widgets Sql Network Xml Svg Qml PrintSupport UiTools
) )
# Old Qt does not provide QT_VERSION_MAJOR # Old Qt does not provide QT_VERSION_MAJOR
@@ -282,13 +282,13 @@ ${PROJECT_NAME}/translationeditor/languageselectdialog.ui
${PROJECT_NAME}/translationeditor/translationeditor.ui ${PROJECT_NAME}/translationeditor/translationeditor.ui
./${PROJECT_NAME}/databrowser/lrdatabrowser.qrc ${PROJECT_NAME}/databrowser/lrdatabrowser.qrc
./${PROJECT_NAME}/dialogdesigner/dialogdesigner.qrc ${PROJECT_NAME}/dialogdesigner/dialogdesigner.qrc
./${PROJECT_NAME}/items/items.qrc ${PROJECT_NAME}/items/items.qrc
./${PROJECT_NAME}/objectinspector/lobjectinspector.qrc ${PROJECT_NAME}/objectinspector/lobjectinspector.qrc
./${PROJECT_NAME}/report.qrc ${PROJECT_NAME}/report.qrc
./${PROJECT_NAME}/scriptbrowser/lrscriptbrowser.qrc ${PROJECT_NAME}/scriptbrowser/lrscriptbrowser.qrc
./${PROJECT_NAME}/translationeditor/translationeditor.qrc ${PROJECT_NAME}/translationeditor/translationeditor.qrc
) )
if (ENABLE_ZINT) if (ENABLE_ZINT)
@@ -409,7 +409,6 @@ target_link_libraries( ${PROJECT_NAME} PUBLIC
Qt${QT_VERSION_MAJOR}::Xml Qt${QT_VERSION_MAJOR}::Xml
Qt${QT_VERSION_MAJOR}::Sql Qt${QT_VERSION_MAJOR}::Sql
Qt${QT_VERSION_MAJOR}::PrintSupport Qt${QT_VERSION_MAJOR}::PrintSupport
Qt${QT_VERSION_MAJOR}::Script
Qt${QT_VERSION_MAJOR}::Svg Qt${QT_VERSION_MAJOR}::Svg
Qt${QT_VERSION_MAJOR}::UiTools) Qt${QT_VERSION_MAJOR}::UiTools)