summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-11-04 11:10:20 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-11-08 15:10:05 +0000
commitc1ba9bb72a3eeb0bd707e609da156798c51c17f0 (patch)
tree4147384cae9f385fcf71cd9772303684c01f46d6
parentc51fe841f472edb4af5d56d436fa6df201b2fc9a (diff)
Fix PlatformHeaders to be a HEADER_MODULE
The module does not have an associated library, but for some reason on Windows install(EXPORT) still created Targets files which expected a library to be present. If then find_package(Qt6PlatformHeaders) was called, it would fail configuration with not finding the library on disk. Switch the module to be a HEADER_MODULE. Also remove the extend_target call, because there apparently is no need to specify the headers one by one (and also because adding sources to an interface only library would break the configuration step). syncqt will be executed on all the headers under the module source location, regardless of specifying them in the project. Change-Id: Iec4cc8fab8906e6288dae423c878e260dd922ce5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
-rw-r--r--src/platformheaders/CMakeLists.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/platformheaders/CMakeLists.txt b/src/platformheaders/CMakeLists.txt
index 89daf13410..bbbd1b76b5 100644
--- a/src/platformheaders/CMakeLists.txt
+++ b/src/platformheaders/CMakeLists.txt
@@ -2,11 +2,9 @@
# special case begin
-# FIXME Add the rest of the stuff
+# FIXME Add the rest of the stuff? I don't think any other stuff is needed?
-add_qt_module(PlatformHeaders)
-
-extend_target(PlatformHeaders CONDITION APPLE SOURCES cocoafunctions/qcocoawindowfunctions.h)
+add_qt_module(PlatformHeaders HEADER_MODULE)
add_qt_docs(PlatformHeaders
doc/qtplatformheaders.qdocconf