diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-16 16:41:28 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-16 16:41:45 +0100 |
commit | f0ab1dd68b0a62e52088290657e09ce907548631 (patch) | |
tree | b260028994e10a3f900da2e7081dfb4d35a9eaaa | |
parent | 1a1416501b484166743d8fc98ef24db7be5bbddb (diff) | |
parent | cc17a13adf162d788596e1616e11a73a106bdda1 (diff) | |
download | qtgraphicaleffects-f0ab1dd68b0a62e52088290657e09ce907548631.tar.gz |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Conflicts:
dependencies.yaml
Change-Id: I2c57de6c60ea3937ae12c42a59500c9f59e3e47d
-rw-r--r-- | .prev_CMakeLists.txt | 23 | ||||
-rw-r--r-- | CMakeLists.txt | 22 | ||||
-rw-r--r-- | coin/module_config.yaml | 13 | ||||
-rw-r--r-- | src/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/effects/CMakeLists.txt | 213 | ||||
-rw-r--r-- | src/effects/private/.prev_CMakeLists.txt | 73 | ||||
-rw-r--r-- | src/effects/private/CMakeLists.txt | 73 | ||||
-rw-r--r-- | src/effects/private/private.pro | 1 | ||||
-rw-r--r-- | tests/.prev_CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tests/auto/CMakeLists.txt | 17 | ||||
-rw-r--r-- | tests/auto/tst_qtgraphicaleffects.cpp | 1 | ||||
-rw-r--r-- | tests/manual/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/manual/smooth/CMakeLists.txt | 48 |
14 files changed, 505 insertions, 0 deletions
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt new file mode 100644 index 0000000..50cd55d --- /dev/null +++ b/.prev_CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from qtgraphicaleffects.pro. + +cmake_minimum_required(VERSION 3.15.0) + +project(graphicaleffects_FIXME + VERSION 6.0.0 + DESCRIPTION "Qt graphicaleffects_FIXME Libraries" + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C +) + +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) +find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) + +if(NOT TARGET Qt::Quick) + message(NOTICE "Skipping the build as the condition \"TARGET Qt::Quick\" is not met.") + return() +endif() +if(NOT QT_CONFIG___contains___opengl) + message(NOTICE "Skipping the build as the condition \"QT_CONFIG___contains___opengl\" is not met.") + return() +endif() +qt_build_repo() diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..19d18e6 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from qtgraphicaleffects.pro. + +cmake_minimum_required(VERSION 3.15.0) + +project(QtGraphicalEffects # special case + VERSION 6.0.0 + DESCRIPTION "Qt Graphical Effects" # special case + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C +) + +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Quick) # special case + +if(NOT TARGET Qt::Quick) + message(NOTICE "Skipping the build as the condition \"TARGET Qt::Quick\" is not met.") + return() +endif() +if(NOT QT_FEATURE_opengl) # special case + message(NOTICE "Skipping the build as the condition \"QT_FEATURE_opengl\" is not met.") # special case + return() +endif() +qt_build_repo() diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 0000000..9f29e11 --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,13 @@ +version: 1 +accept_configuration: + condition: property + property: host.os + equals_property: target.os + +build_instructions: + - !include "{{qt/qtbase}}/prepare_building_env.yaml" + - !include "{{qt/qtbase}}/cmake_module_build_instructions.yaml" + - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml" + +test_instructions: + - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..b344062 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,3 @@ +# Generated from src.pro. + +add_subdirectory(effects) diff --git a/src/effects/CMakeLists.txt b/src/effects/CMakeLists.txt new file mode 100644 index 0000000..14c9213 --- /dev/null +++ b/src/effects/CMakeLists.txt @@ -0,0 +1,213 @@ +# Generated from effects.pro. + +##################################################################### +## qtgraphicaleffectsplugin Plugin: +##################################################################### + +add_qml_module(qtgraphicaleffectsplugin + URI "QtGraphicalEffects" + VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + DESIGNER_SUPPORTED + CLASSNAME QtGraphicalEffectsPlugin + DEPENDENCIES + QtGraphicalEffects/private/1.0 + QtQuick.Window/2.1 + SOURCES + plugin.cpp + PUBLIC_LIBRARIES + Qt::Qml + Qt::Quick +) + +# Resources: +set(qtgraphicaleffectsshaders_resource_files + "shaders/+glslcore/brightnesscontrast.frag" + "shaders/+glslcore/colorize.frag" + "shaders/+glslcore/coloroverlay.frag" + "shaders/+glslcore/conicalgradient_mask.frag" + "shaders/+glslcore/conicalgradient_nomask.frag" + "shaders/+glslcore/desaturate.frag" + "shaders/+glslcore/displace.frag" + "shaders/+glslcore/fastblur.frag" + "shaders/+glslcore/fastblur_internal.frag" + "shaders/+glslcore/fastblur_internal.vert" + "shaders/+glslcore/fastglow.frag" + "shaders/+glslcore/fastinnershadow.frag" + "shaders/+glslcore/fastinnershadow_level0.frag" + "shaders/+glslcore/fastmaskedblur.frag" + "shaders/+glslcore/gammaadjust.frag" + "shaders/+glslcore/gaussianinnershadow.frag" + "shaders/+glslcore/gaussianinnershadow_shadow.frag" + "shaders/+glslcore/huesaturation.frag" + "shaders/+glslcore/leveladjust.frag" + "shaders/+glslcore/lineargradient.vert" + "shaders/+glslcore/lineargradient_mask.frag" + "shaders/+glslcore/lineargradient_nomask.frag" + "shaders/+glslcore/opacitymask.frag" + "shaders/+glslcore/opacitymask_invert.frag" + "shaders/+glslcore/radialgradient.vert" + "shaders/+glslcore/radialgradient_mask.frag" + "shaders/+glslcore/radialgradient_nomask.frag" + "shaders/+glslcore/rectangularglow.frag" + "shaders/+glslcore/recursiveblur.frag" + "shaders/+glslcore/recursiveblur.vert" + "shaders/+glslcore/thresholdmask.frag" + "shaders/brightnesscontrast.frag" + "shaders/colorize.frag" + "shaders/coloroverlay.frag" + "shaders/conicalgradient_mask.frag" + "shaders/conicalgradient_nomask.frag" + "shaders/desaturate.frag" + "shaders/displace.frag" + "shaders/fastblur.frag" + "shaders/fastblur_internal.frag" + "shaders/fastblur_internal.vert" + "shaders/fastglow.frag" + "shaders/fastinnershadow.frag" + "shaders/fastinnershadow_level0.frag" + "shaders/fastmaskedblur.frag" + "shaders/gammaadjust.frag" + "shaders/gaussianinnershadow.frag" + "shaders/gaussianinnershadow_shadow.frag" + "shaders/huesaturation.frag" + "shaders/leveladjust.frag" + "shaders/lineargradient.vert" + "shaders/lineargradient_mask.frag" + "shaders/lineargradient_nomask.frag" + "shaders/opacitymask.frag" + "shaders/opacitymask_invert.frag" + "shaders/radialgradient.vert" + "shaders/radialgradient_mask.frag" + "shaders/radialgradient_nomask.frag" + "shaders/rectangularglow.frag" + "shaders/recursiveblur.frag" + "shaders/recursiveblur.vert" + "shaders/thresholdmask.frag" +) + +add_qt_resource(qtgraphicaleffectsplugin "qtgraphicaleffectsshaders" + PREFIX + "/qt-project.org/imports/QtGraphicalEffects" + FILES + ${qtgraphicaleffectsshaders_resource_files} +) + + +#### Keys ignored in scope 2:.:.:effects_plugin.pro:<TRUE>: +# CXX_MODULE = "qml" +# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" +# QML_FILES = "Blend.qml" "BrightnessContrast.qml" "ColorOverlay.qml" "Colorize.qml" "ConicalGradient.qml" "Desaturate.qml" "DirectionalBlur.qml" "Displace.qml" "DropShadow.qml" "FastBlur.qml" "GammaAdjust.qml" "GaussianBlur.qml" "Glow.qml" "HueSaturation.qml" "InnerShadow.qml" "LevelAdjust.qml" "LinearGradient.qml" "MaskedBlur.qml" "OpacityMask.qml" "RadialBlur.qml" "RadialGradient.qml" "RectangularGlow.qml" "RecursiveBlur.qml" "ThresholdMask.qml" "ZoomBlur.qml" +# TARGETPATH = "QtGraphicalEffects" + +set(qml_files + "Blend.qml" + "BrightnessContrast.qml" + "ColorOverlay.qml" + "Colorize.qml" + "ConicalGradient.qml" + "Desaturate.qml" + "DirectionalBlur.qml" + "Displace.qml" + "DropShadow.qml" + "FastBlur.qml" + "GammaAdjust.qml" + "GaussianBlur.qml" + "Glow.qml" + "HueSaturation.qml" + "InnerShadow.qml" + "LevelAdjust.qml" + "LinearGradient.qml" + "MaskedBlur.qml" + "OpacityMask.qml" + "RadialBlur.qml" + "RadialGradient.qml" + "RectangularGlow.qml" + "RecursiveBlur.qml" + "ThresholdMask.qml" + "ZoomBlur.qml" +) +set_source_files_properties(Blend.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(BrightnessContrast.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(ColorOverlay.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(Colorize.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(ConicalGradient.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(Desaturate.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(DirectionalBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(Displace.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(DropShadow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(FastBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(GammaAdjust.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(GaussianBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(Glow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(HueSaturation.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(InnerShadow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(LevelAdjust.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(LinearGradient.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(MaskedBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(OpacityMask.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(RadialBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(RadialGradient.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(RectangularGlow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(RecursiveBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(ThresholdMask.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(ZoomBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) + +qt6_target_qml_files(qtgraphicaleffectsplugin + FILES + ${qml_files} +) +add_qt_docs(qtgraphicaleffectsplugin + doc/qtgraphicaleffects.qdocconf +) + +add_subdirectory(private) diff --git a/src/effects/private/.prev_CMakeLists.txt b/src/effects/private/.prev_CMakeLists.txt new file mode 100644 index 0000000..aba6f59 --- /dev/null +++ b/src/effects/private/.prev_CMakeLists.txt @@ -0,0 +1,73 @@ +# Generated from private.pro. + +##################################################################### +## qtgraphicaleffectsprivate Plugin: +##################################################################### + +qt_add_qml_module(qtgraphicaleffectsprivate + URI "QtGraphicalEffects.private" + VERSION "${CMAKE_PROJECT_VERSION}" + CLASSNAME QtGraphicalEffectsPrivatePlugin + SOURCES + plugin.cpp + qgfxshaderbuilder.cpp qgfxshaderbuilder_p.h + qgfxsourceproxy.cpp qgfxsourceproxy_p.h + PUBLIC_LIBRARIES + Qt::Core + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Qml + Qt::QmlPrivate + Qt::Quick + Qt::QuickPrivate +) + +#### Keys ignored in scope 1:.:.:private.pro:<TRUE>: +# CXX_MODULE = "qml" +# QML_FILES = "DropShadowBase.qml" "FastGlow.qml" "FastInnerShadow.qml" "FastMaskedBlur.qml" "GaussianDirectionalBlur.qml" "GaussianGlow.qml" "GaussianInnerShadow.qml" "GaussianMaskedBlur.qml" +# QML_IMPORT_VERSION = "$$QT_VERSION" +# TARGETPATH = "QtGraphicalEffects/private" + +## Scopes: +##################################################################### + +set(qml_files + "DropShadowBase.qml" + "FastGlow.qml" + "FastInnerShadow.qml" + "FastMaskedBlur.qml" + "GaussianDirectionalBlur.qml" + "GaussianGlow.qml" + "GaussianInnerShadow.qml" + "GaussianMaskedBlur.qml" +) +set_source_files_properties(DropShadowBase.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(FastGlow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(FastInnerShadow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(FastMaskedBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(GaussianDirectionalBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(GaussianGlow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(GaussianInnerShadow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(GaussianMaskedBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) + +qt6_target_qml_files(qtgraphicaleffectsprivate + FILES + ${qml_files} +) diff --git a/src/effects/private/CMakeLists.txt b/src/effects/private/CMakeLists.txt new file mode 100644 index 0000000..aba6f59 --- /dev/null +++ b/src/effects/private/CMakeLists.txt @@ -0,0 +1,73 @@ +# Generated from private.pro. + +##################################################################### +## qtgraphicaleffectsprivate Plugin: +##################################################################### + +qt_add_qml_module(qtgraphicaleffectsprivate + URI "QtGraphicalEffects.private" + VERSION "${CMAKE_PROJECT_VERSION}" + CLASSNAME QtGraphicalEffectsPrivatePlugin + SOURCES + plugin.cpp + qgfxshaderbuilder.cpp qgfxshaderbuilder_p.h + qgfxsourceproxy.cpp qgfxsourceproxy_p.h + PUBLIC_LIBRARIES + Qt::Core + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Qml + Qt::QmlPrivate + Qt::Quick + Qt::QuickPrivate +) + +#### Keys ignored in scope 1:.:.:private.pro:<TRUE>: +# CXX_MODULE = "qml" +# QML_FILES = "DropShadowBase.qml" "FastGlow.qml" "FastInnerShadow.qml" "FastMaskedBlur.qml" "GaussianDirectionalBlur.qml" "GaussianGlow.qml" "GaussianInnerShadow.qml" "GaussianMaskedBlur.qml" +# QML_IMPORT_VERSION = "$$QT_VERSION" +# TARGETPATH = "QtGraphicalEffects/private" + +## Scopes: +##################################################################### + +set(qml_files + "DropShadowBase.qml" + "FastGlow.qml" + "FastInnerShadow.qml" + "FastMaskedBlur.qml" + "GaussianDirectionalBlur.qml" + "GaussianGlow.qml" + "GaussianInnerShadow.qml" + "GaussianMaskedBlur.qml" +) +set_source_files_properties(DropShadowBase.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(FastGlow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(FastInnerShadow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(FastMaskedBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(GaussianDirectionalBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(GaussianGlow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(GaussianInnerShadow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(GaussianMaskedBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) + +qt6_target_qml_files(qtgraphicaleffectsprivate + FILES + ${qml_files} +) diff --git a/src/effects/private/private.pro b/src/effects/private/private.pro index 64d63c9..ef63d6b 100644 --- a/src/effects/private/private.pro +++ b/src/effects/private/private.pro @@ -1,6 +1,7 @@ CXX_MODULE=qml TARGETPATH=QtGraphicalEffects/private TARGET = qtgraphicaleffectsprivate +QML_IMPORT_VERSION = $$QT_VERSION QT += quick qml # Needed to get a hold of QQuickShaderEffectSource, QQuickImage and QQuickItemPrivate diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt new file mode 100644 index 0000000..2214137 --- /dev/null +++ b/tests/.prev_CMakeLists.txt @@ -0,0 +1,7 @@ +# Generated from tests.pro. + +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. +endif() +qt_build_tests() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 0000000..ed965c0 --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,8 @@ +# Generated from tests.pro. + +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. +endif() +qt_build_tests() + diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt new file mode 100644 index 0000000..1c2a2cb --- /dev/null +++ b/tests/auto/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from auto.pro. + +##################################################################### +## tst_qtgraphicaleffects Test: +##################################################################### + +qt_add_test(tst_qtgraphicaleffects + SOURCES + tst_qtgraphicaleffects.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml + Qt::Quick +) + +#### Keys ignored in scope 1:.:.:auto.pro:<TRUE>: +# DISTFILES = "dummy.qml" diff --git a/tests/auto/tst_qtgraphicaleffects.cpp b/tests/auto/tst_qtgraphicaleffects.cpp index 1d7a633..a6e8127 100644 --- a/tests/auto/tst_qtgraphicaleffects.cpp +++ b/tests/auto/tst_qtgraphicaleffects.cpp @@ -28,6 +28,7 @@ #include <qtest.h> #include <QtCore/qscopedpointer.h> +#include <QtCore/QLibraryInfo> #include <QtQml> class tst_qtgraphicaleffects : public QObject diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt new file mode 100644 index 0000000..de858a2 --- /dev/null +++ b/tests/manual/CMakeLists.txt @@ -0,0 +1,3 @@ +# Generated from manual.pro. + +add_subdirectory(smooth) diff --git a/tests/manual/smooth/CMakeLists.txt b/tests/manual/smooth/CMakeLists.txt new file mode 100644 index 0000000..3efec4a --- /dev/null +++ b/tests/manual/smooth/CMakeLists.txt @@ -0,0 +1,48 @@ +# Generated from smooth.pro. + +##################################################################### +## smooth Binary: +##################################################################### + +qt_add_manual_test(smooth + GUI + SOURCES + main.cpp + DEFINES + QT_DEPRECATED_WARNINGS + PUBLIC_LIBRARIES + Qt::Gui + Qt::Quick +) + +# Resources: +set(resources_resource_files + "CellContainer.qml" + "SourceImage.qml" + "main.qml" + "star.png" +) + +qt_add_resource(smooth "resources" + PREFIX + "/" + FILES + ${resources_resource_files} +) + + +#### Keys ignored in scope 1:.:.:smooth.pro:<TRUE>: +# QML_DESIGNER_IMPORT_PATH = <EMPTY> +# QML_IMPORT_PATH = <EMPTY> + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:smooth.pro:QNX: +# target.path = "/tmp/$${TARGET}/bin" + +#### Keys ignored in scope 4:.:.:smooth.pro:UNIX AND NOT ANDROID: +# target.path = "/opt/$${TARGET}/bin" + +#### Keys ignored in scope 5:.:.:smooth.pro:NOT target.path_ISEMPTY: +# INSTALLS = "target" |