diff options
| author | Joerg Bornemann <[email protected]> | 2022-08-17 13:22:40 +0200 |
|---|---|---|
| committer | Joerg Bornemann <[email protected]> | 2022-08-17 17:02:26 +0200 |
| commit | 2f7a78cd7b3351bc7a1a209d0822769d111f246b (patch) | |
| tree | a41722adac5371bb065f86109311be5449d67183 | |
| parent | f3509565480107c2587212f7d55cc5f92facc417 (diff) | |
CMake: Allow for CMAKE_INSTALL_BINDIR set to . in deployment API
Esp. on Windows, it can be desirable to deploy an application and its
DLLs directly in the install prefix, without a bin directory. To do
that, one must set CMAKE_INSTALL_BINDIR to ".", but that resulted in a
faulty prefix entry in the generated qt.conf.
Check for this case when generating qt.conf to write the correct prefix.
Fixes: QTBUG-105583
Pick-to: 6.3 6.4
Change-Id: I0e8295c70b48b991c19f58f6b3f2ed132112dd29
Reviewed-by: Alexandru Croitor <[email protected]>
| -rw-r--r-- | src/corelib/Qt6CoreDeploySupport.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt6CoreDeploySupport.cmake b/src/corelib/Qt6CoreDeploySupport.cmake index 5c3d6d7a2a4..21dec80dd76 100644 --- a/src/corelib/Qt6CoreDeploySupport.cmake +++ b/src/corelib/Qt6CoreDeploySupport.cmake @@ -174,7 +174,7 @@ function(qt6_deploy_runtime_dependencies) endif() elseif(arg_GENERATE_QT_CONF) get_filename_component(exe_dir "${arg_EXECUTABLE}" DIRECTORY) - if(exe_dir STREQUAL "") + if(exe_dir STREQUAL "" OR exe_dir STREQUAL ".") set(exe_dir ".") set(prefix ".") else() |