From ad312879b5c37ddcf86fcc51b2af3e34f26f6b4c Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Mon, 11 Feb 2019 14:21:25 +0100 Subject: cmake: Build platformcompositor Change-Id: Ib9855e8ce0abddf5dce3408f10d3c2d32a2df937 Reviewed-by: Simon Hausmann --- src/platformsupport/platformcompositor/CMakeLists.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/platformsupport/platformcompositor/CMakeLists.txt (limited to 'src/platformsupport/platformcompositor/CMakeLists.txt') diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt new file mode 100644 index 0000000000..e6b7ab1f93 --- /dev/null +++ b/src/platformsupport/platformcompositor/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from platformcompositor.pro. + +##################################################################### +## PlatformCompositorSupport Module: +##################################################################### + +add_qt_module(PlatformCompositorSupport + STATIC + SOURCES + qopenglcompositor.cpp qopenglcompositor_p.h + qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h + DEFINES + QT_NO_CAST_FROM_ASCII + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate +) -- cgit v1.2.3 From 4cf7ec0665001c9eee6bd947a698032022cddd0d Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 29 Mar 2019 11:54:22 +0100 Subject: CMake: Re-generate platformsupport/platformcompositor Change-Id: I4efe3cc2920c0efe83f8e2b7028020558a78c778 Reviewed-by: Albert Astals Cid --- src/platformsupport/platformcompositor/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/platformsupport/platformcompositor/CMakeLists.txt') diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt index e6b7ab1f93..a8696be5cd 100644 --- a/src/platformsupport/platformcompositor/CMakeLists.txt +++ b/src/platformsupport/platformcompositor/CMakeLists.txt @@ -15,3 +15,8 @@ add_qt_module(PlatformCompositorSupport Qt::CorePrivate Qt::GuiPrivate ) + +#### Keys ignored in scope 1:.:platformcompositor.pro:: +# CONFIG = "static" "internal_module" +# MODULE = "platformcompositor_support" +# _LOADED = "qt_module" -- cgit v1.2.3 From d1a0af9b0c56e520ad478e908e3abba6601fea01 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 6 May 2019 15:06:23 +0200 Subject: CMake: Regenerate src/platformsupport/platformcompositor Change-Id: I435fb110ad59eb197401c6d8090c697ceb4cf687 Reviewed-by: Alexandru Croitor --- src/platformsupport/platformcompositor/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/platformsupport/platformcompositor/CMakeLists.txt') diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt index a8696be5cd..1cb4752ead 100644 --- a/src/platformsupport/platformcompositor/CMakeLists.txt +++ b/src/platformsupport/platformcompositor/CMakeLists.txt @@ -14,9 +14,12 @@ add_qt_module(PlatformCompositorSupport LIBRARIES Qt::CorePrivate Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui ) -#### Keys ignored in scope 1:.:platformcompositor.pro:: +#### Keys ignored in scope 1:.:.:platformcompositor.pro:: # CONFIG = "static" "internal_module" # MODULE = "platformcompositor_support" # _LOADED = "qt_module" -- cgit v1.2.3 From a6c11d3e09f8ebc923eb043e6c090997d21f2ac9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 5 Jun 2019 13:49:08 +0200 Subject: Add support for private module .pri files Generate a pri file for public and private interfaces, but map CONFIG += internal_module to a cmake option and skip the former if set. Task-number: QTBUG-75666 Change-Id: I3f4baf1277094f4c22149a9e8769734baf9a235f Reviewed-by: Alexandru Croitor --- src/platformsupport/platformcompositor/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'src/platformsupport/platformcompositor/CMakeLists.txt') diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt index 1cb4752ead..c37ba600b3 100644 --- a/src/platformsupport/platformcompositor/CMakeLists.txt +++ b/src/platformsupport/platformcompositor/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_module(PlatformCompositorSupport STATIC + INTERNAL_MODULE SOURCES qopenglcompositor.cpp qopenglcompositor_p.h qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h -- cgit v1.2.3 From 9ff225b0e0fdd6472bcfee0b4d810239940dea42 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 7 Oct 2019 17:43:07 +0200 Subject: Regenerate platformsupport projects Change-Id: I6f9d6b09a0b62171adedffa326b86f57e42ad449 Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- src/platformsupport/platformcompositor/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'src/platformsupport/platformcompositor/CMakeLists.txt') diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt index c37ba600b3..0d3bc597c0 100644 --- a/src/platformsupport/platformcompositor/CMakeLists.txt +++ b/src/platformsupport/platformcompositor/CMakeLists.txt @@ -21,6 +21,5 @@ add_qt_module(PlatformCompositorSupport ) #### Keys ignored in scope 1:.:.:platformcompositor.pro:: -# CONFIG = "static" "internal_module" # MODULE = "platformcompositor_support" # _LOADED = "qt_module" -- cgit v1.2.3 From cb6f92c481a451bb8a7a26c8d933761896cf3884 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 12 Nov 2019 14:26:58 +0100 Subject: Regenerate everything under ./src Change-Id: Ibdbdc17f8c2ee41356f490dd839a47e1bcf4c586 Reviewed-by: Leander Beernaert Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- src/platformsupport/platformcompositor/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'src/platformsupport/platformcompositor/CMakeLists.txt') diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt index 0d3bc597c0..ee8a47f084 100644 --- a/src/platformsupport/platformcompositor/CMakeLists.txt +++ b/src/platformsupport/platformcompositor/CMakeLists.txt @@ -22,4 +22,3 @@ add_qt_module(PlatformCompositorSupport #### Keys ignored in scope 1:.:.:platformcompositor.pro:: # MODULE = "platformcompositor_support" -# _LOADED = "qt_module" -- cgit v1.2.3 From e9a58ba9e55467f8c69e19dd52c2afa7cbb39529 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 13 Nov 2019 15:00:38 +0100 Subject: Regenerate src/* Change-Id: I0314b4faa1e4860e86198eea4189987e527dfec2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- src/platformsupport/platformcompositor/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/platformsupport/platformcompositor/CMakeLists.txt') diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt index ee8a47f084..b8b59a2723 100644 --- a/src/platformsupport/platformcompositor/CMakeLists.txt +++ b/src/platformsupport/platformcompositor/CMakeLists.txt @@ -4,7 +4,7 @@ ## PlatformCompositorSupport Module: ##################################################################### -add_qt_module(PlatformCompositorSupport +qt_add_module(PlatformCompositorSupport STATIC INTERNAL_MODULE SOURCES -- cgit v1.2.3