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

Add variable linked to configure-time executables to detect CMakeCache wiping

Browse Source 
Wiping of CMakeCache should lead to removing of CMakeCache that is
generated for configure-time executable. Otherwise configure-time
executables might still use wrong compiler or compiler flags.

Pick-to: 6.6 6.5
Task-number: QTBUG-116789
Change-Id: I702d5d29e0c5f35a8a36311cf9a84ea7a0f4d781
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2023-09-08 12:01:22 +02:00
parent a9c63e826c
commit 9d11e50190
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/QtExecutableHelpers.cmake
View File

@ -422,7 +422,8 @@ function(qt_internal_add_configure_time_executable target)
) )
set(should_build_at_configure_time TRUE) set(should_build_at_configure_time TRUE)
if(EXISTS "${target_binary_path}" AND EXISTS "${timestamp_file}") if(QT_INTERNAL_HAVE_CONFIGURE_TIME_${target} AND
EXISTS "${target_binary_path}" AND EXISTS "${timestamp_file}")
set(last_ts 0) set(last_ts 0)
foreach(source IN LISTS sources) foreach(source IN LISTS sources)
file(TIMESTAMP "${source}" ts "%s") file(TIMESTAMP "${source}" ts "%s")
@ -488,6 +489,10 @@ function(qt_internal_add_configure_time_executable target)
endif() endif()
endforeach() endforeach()
if(EXISTS "${target_binary_dir}/CMakeCache.txt")
file(REMOVE "${target_binary_dir}/CMakeCache.txt")
endif()
try_compile(result try_compile(result
"${target_binary_dir}" "${target_binary_dir}"
"${target_binary_dir}" "${target_binary_dir}"
@ -497,6 +502,8 @@ function(qt_internal_add_configure_time_executable target)
) )
file(WRITE "${timestamp_file}" "") file(WRITE "${timestamp_file}" "")
set(QT_INTERNAL_HAVE_CONFIGURE_TIME_${target} ${result} CACHE INTERNAL
"Indicates that the configure-time target ${target} was built")
if(NOT result) if(NOT result)
message(FATAL_ERROR "Unable to build ${target}: ${try_compile_output}") message(FATAL_ERROR "Unable to build ${target}: ${try_compile_output}")
endif() endif()