1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't hardcode the include directory name

Browse Source 
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>
This commit is contained in:
Christophe Giboudeaux 2020-01-26 12:25:40 +01:00 committed by Alexandru Croitor
parent 3f386095ad
commit 4954adea39
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtBaseGlobalTargets.cmake
View File

@ -4,7 +4,7 @@ add_library(Qt::Platform ALIAS Platform)
target_include_directories(Platform target_include_directories(Platform
INTERFACE INTERFACE
$<BUILD_INTERFACE:${QT_PLATFORM_DEFINITION_DIR_ABSOLUTE}> $<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:${QT_PLATFORM_DEFINITION_DIR}>
$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}> $<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}>
) )

12
cmake/QtBuild.cmake
View File

@ -931,8 +931,8 @@ function(qt_internal_module_info result target)
string(REPLACE "." "_" define "${define}") string(REPLACE "." "_" define "${define}")
set("${result}_upper" "${upper}" PARENT_SCOPE) set("${result}_upper" "${upper}" PARENT_SCOPE)
set("${result}_lower" "${lower}" PARENT_SCOPE) set("${result}_lower" "${lower}" PARENT_SCOPE)
set("${result}_repo_include_dir" "${QT_BUILD_DIR}/include" PARENT_SCOPE) set("${result}_repo_include_dir" "${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}" PARENT_SCOPE)
set("${result}_include_dir" "${QT_BUILD_DIR}/include/${module}" PARENT_SCOPE) set("${result}_include_dir" "${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}/${module}" PARENT_SCOPE)
set("${result}_define" "${define}" PARENT_SCOPE) set("${result}_define" "${define}" PARENT_SCOPE)
endfunction() endfunction()
@ -1715,7 +1715,7 @@ function(qt_add_module target)
if(NOT arg_NO_MODULE_HEADERS AND NOT arg_NO_SYNC_QT) if(NOT arg_NO_MODULE_HEADERS AND NOT arg_NO_SYNC_QT)
# For the syncqt headers # For the syncqt headers
list(APPEND ${public_headers_list} "$<INSTALL_INTERFACE:include/${module}>") list(APPEND ${public_headers_list} "$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}/${module}>")
endif() endif()
list(APPEND ${public_headers_list} ${arg_PUBLIC_INCLUDE_DIRECTORIES}) 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}>") "$<INSTALL_INTERFACE:${fw_headers_dir}${PROJECT_VERSION}/${module}>")
else() else()
list(APPEND interface_includes list(APPEND interface_includes
"$<INSTALL_INTERFACE:include/${module}/${PROJECT_VERSION}>" "$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}/${module}/${PROJECT_VERSION}>"
"$<INSTALL_INTERFACE:include/${module}/${PROJECT_VERSION}/${module}>") "$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}/${module}/${PROJECT_VERSION}/${module}>")
endif() endif()
endif() endif()
endif() endif()
@ -2796,7 +2796,7 @@ function(qt_add_test name)
set(private_includes set(private_includes
"${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
"$<BUILD_INTERFACE:${QT_BUILD_DIR}/include>" "$<BUILD_INTERFACE:${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}>"
${arg_INCLUDE_DIRECTORIES} ${arg_INCLUDE_DIRECTORIES}
) )

2
cmake/QtPostProcess.cmake
View File

@ -1,6 +1,6 @@
function(qt_internal_write_depends_file target) function(qt_internal_write_depends_file target)
set(module Qt${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}...") message("Generate ${outfile}...")
set(contents "/* This file was generated by cmake with the info from ${module} target. */\n") 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") string(APPEND contents "#ifdef __cplusplus /* create empty PCH in C mode */\n")