From 0cdb4b20d3d9acf57cd4b23d599f94f49c89ff7a Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Thu, 2 Apr 2020 09:53:02 +0200
Subject: [PATCH] CMake: Remove HEADER_MODULE handling from 3rd party libs

Installing headers is not supported for 3rd party libs (we don't run
syncqt, we don't install headers for 3rd party libs to
prefix/include).

Remove the unnecessary condition.

Change-Id: I46e9af7a7ca9de0138666b0d0faffc86238672ba
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtBuild.cmake | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 51ad1f899d..80dc5f02fa 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -3096,22 +3096,20 @@ function(qt_add_3rdparty_library target)
 
     qt_skip_warnings_are_errors_when_repo_unclean("${target}")
 
-    if(NOT arg_HEADER_MODULE)
-        set_target_properties(${target} PROPERTIES
-            LIBRARY_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_LIBDIR}"
-            RUNTIME_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
-            ARCHIVE_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_LIBDIR}"
-            VERSION ${PROJECT_VERSION}
-            SOVERSION ${PROJECT_VERSION_MAJOR}
-            QT_MODULE_IS_3RDPARTY_LIBRARY TRUE
-            QT_MODULE_SKIP_DEPENDS_INCLUDE TRUE
-        )
-        qt_handle_multi_config_output_dirs("${target}")
+    set_target_properties(${target} PROPERTIES
+        LIBRARY_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_LIBDIR}"
+        RUNTIME_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
+        ARCHIVE_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_LIBDIR}"
+        VERSION ${PROJECT_VERSION}
+        SOVERSION ${PROJECT_VERSION_MAJOR}
+        QT_MODULE_IS_3RDPARTY_LIBRARY TRUE
+        QT_MODULE_SKIP_DEPENDS_INCLUDE TRUE
+    )
+    qt_handle_multi_config_output_dirs("${target}")
 
-        set_target_properties(${target} PROPERTIES
-            OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}"
-        )
-    endif()
+    set_target_properties(${target} PROPERTIES
+        OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}"
+    )
 
     if(NOT arg_INTERFACE)
         # This property is used for super builds with static libraries. We use