From 9c7ebd191b9862c28e9c96a511ec2878b7a3591d Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Thu, 20 Jun 2019 15:26:39 +0200
Subject: CMake: Create Config.cmake files for internal modules in static
 builds

This change will create Config.cmake files for internal modules like
AccessibilitySupport when doing static builds. They need to be
find_package()'ed and linked in when linking in certain qt plugins.

Task-number: QTBUG-38913
Task-number: QTBUG-76562
Change-Id: Ia2e446025c87df48f20bb65cfd9da6c6a4354bb1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 mkspecs/features/create_cmake.prf                   | 8 ++++++++
 mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 4 ++++
 mkspecs/features/qt_module.prf                      | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 68e6b6d265..fe9149b1c1 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -26,6 +26,10 @@ contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND
 
 CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake
 
+internal_module {
+    MODULE = "$${MODULE}_private"
+}
+
 # Core, Network, an external module named Foo
 CMAKE_MODULE_NAME = $$cmakeModuleName($${MODULE})
 
@@ -112,6 +116,10 @@ win32:!static:!staticlib {
 
 static|staticlib:CMAKE_STATIC_TYPE = true
 
+internal_module {
+    CMAKE_INTERNAL_MODULE = true
+}
+
 CMAKE_DEBUG_TYPE =
 CMAKE_RELEASE_TYPE =
 
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index daebbd6554..8a3f202c53 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -484,6 +484,8 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     )
 !!ENDIF // TEMPLATE != aux
 
+!!IF isEmpty(CMAKE_INTERNAL_MODULE)
+
     file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
 
     macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
@@ -506,6 +508,8 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         endforeach()
     endif()
 
+!!ENDIF // isEmpty(CMAKE_INTERNAL_MODULE)
+
 
 !!IF !isEmpty(CMAKE_MODULE_EXTRAS)
     include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index ee7de22059..46687f262e 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -117,7 +117,7 @@ unset(QT_FOR_PRIVATE)
 QMAKE_USE_PRIVATE += $$QMAKE_USE_FOR_PRIVATE
 unset(QMAKE_USE_FOR_PRIVATE)
 
-!internal_module:CONFIG += create_cmake
+CONFIG += create_cmake
 
 contains(TARGET, QtAddOn.*): \
     DEFINES += QT_BUILD_ADDON_$${ucmodule}_LIB
-- 
cgit v1.2.3