From 4954adea39cb9e02be36c9b786016ac2802fcbb9 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Sun, 26 Jan 2020 12:25:40 +0100
Subject: Don't hardcode the include directory name

Hardcoding "lib" caused build issues and wrong
INTERFACE_INCLUDE_DIRECTORIES paths in generated CMake configuration
files if INSTALL_INCLUDEDIR pointed to a different location.

Contributes to QTBUG-81289

Change-Id: I3276ecbb4bf5df1c0b4c496c0287b4a69586d683
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtBaseGlobalTargets.cmake |  2 +-
 cmake/QtBuild.cmake             | 12 ++++++------
 cmake/QtPostProcess.cmake       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake
index a8189dad5f..fb27618499 100644
--- a/cmake/QtBaseGlobalTargets.cmake
+++ b/cmake/QtBaseGlobalTargets.cmake
@@ -4,7 +4,7 @@ add_library(Qt::Platform ALIAS Platform)
 target_include_directories(Platform
     INTERFACE
     $<BUILD_INTERFACE:${QT_PLATFORM_DEFINITION_DIR_ABSOLUTE}>
-    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/${INSTALL_INCLUDEDIR}>
     $<INSTALL_INTERFACE:${QT_PLATFORM_DEFINITION_DIR}>
     $<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}>
     )
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index e23d0e93d1..22cfcaa510 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -931,8 +931,8 @@ function(qt_internal_module_info result target)
     string(REPLACE "." "_" define "${define}")
     set("${result}_upper" "${upper}" PARENT_SCOPE)
     set("${result}_lower" "${lower}" PARENT_SCOPE)
-    set("${result}_repo_include_dir" "${QT_BUILD_DIR}/include" PARENT_SCOPE)
-    set("${result}_include_dir" "${QT_BUILD_DIR}/include/${module}" PARENT_SCOPE)
+    set("${result}_repo_include_dir" "${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}" PARENT_SCOPE)
+    set("${result}_include_dir" "${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}/${module}" PARENT_SCOPE)
     set("${result}_define" "${define}" PARENT_SCOPE)
 endfunction()
 
@@ -1715,7 +1715,7 @@ function(qt_add_module target)
 
     if(NOT arg_NO_MODULE_HEADERS AND NOT arg_NO_SYNC_QT)
         # For the syncqt headers
-        list(APPEND ${public_headers_list} "$<INSTALL_INTERFACE:include/${module}>")
+        list(APPEND ${public_headers_list} "$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}/${module}>")
     endif()
     list(APPEND ${public_headers_list} ${arg_PUBLIC_INCLUDE_DIRECTORIES})
 
@@ -1947,8 +1947,8 @@ set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})")
                             "$<INSTALL_INTERFACE:${fw_headers_dir}${PROJECT_VERSION}/${module}>")
             else()
                 list(APPEND interface_includes
-                            "$<INSTALL_INTERFACE:include/${module}/${PROJECT_VERSION}>"
-                            "$<INSTALL_INTERFACE:include/${module}/${PROJECT_VERSION}/${module}>")
+                            "$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}/${module}/${PROJECT_VERSION}>"
+                            "$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}/${module}/${PROJECT_VERSION}/${module}>")
             endif()
         endif()
     endif()
@@ -2796,7 +2796,7 @@ function(qt_add_test name)
         set(private_includes
             "${CMAKE_CURRENT_SOURCE_DIR}"
             "${CMAKE_CURRENT_BINARY_DIR}"
-            "$<BUILD_INTERFACE:${QT_BUILD_DIR}/include>"
+            "$<BUILD_INTERFACE:${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}>"
              ${arg_INCLUDE_DIRECTORIES}
         )
 
diff --git a/cmake/QtPostProcess.cmake b/cmake/QtPostProcess.cmake
index ab2cab447f..afd1cfd1dd 100644
--- a/cmake/QtPostProcess.cmake
+++ b/cmake/QtPostProcess.cmake
@@ -1,6 +1,6 @@
 function(qt_internal_write_depends_file target)
     set(module Qt${target})
-    set(outfile "${QT_BUILD_DIR}/include/${module}/${module}Depends")
+    set(outfile "${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}/${module}/${module}Depends")
     message("Generate ${outfile}...")
     set(contents "/* This file was generated by cmake with the info from ${module} target. */\n")
     string(APPEND contents "#ifdef __cplusplus /* create empty PCH in C mode */\n")
-- 
cgit v1.2.3