diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-09 11:39:56 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-09 12:01:13 +0000 |
| commit | 0d5fdcee74b76175e0b03269b12d9bd4b6eee9c4 (patch) | |
| tree | f7ba60c06c2fdc39631f5795fb4cdcdab2caf503 /share/CMakeLists.txt | |
| parent | 0b74ad4f60c25a8293ad6a72bc5012464d0ed528 (diff) | |
cmake: Fix issues with configuring locations on Windows
Make DLL destination configurable independently of LIB destination.
In Qt Creator we put DLLs into bin\, but LIBs into lib\.
Fix installation of plugin DLLs by adding corresponding RUNTIME section.
Fix setting PATH to Qt & Qbs libraries for BuildQbsResources.
Change-Id: I5029e82b8822c7e3ad43afe69530b2d4e2f918b3
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share/CMakeLists.txt')
| -rw-r--r-- | share/CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt index 8f53804fd..bfc657b6f 100644 --- a/share/CMakeLists.txt +++ b/share/CMakeLists.txt @@ -33,7 +33,13 @@ install( ) if(WIN32) - set(UPDATE_PATH_COMMAND set "PATH=${QT_QMAKE_EXECUTABLE}/..\;%PATH%") + get_target_property(_QTCORE_LIBRARY Qt5::Core IMPORTED_LOCATION_RELEASE) + if(NOT _QTCORE_LIBRARY) + get_target_property(_QTCORE_LIBRARY Qt5::Core IMPORTED_LOCATION_DEBUG) + endif() + get_filename_component(_QT_LIBRARY_PATH "${_QTCORE_LIBRARY}" DIRECTORY) + get_target_property(_QBS_LIBRARY_PATH qbscore LIBRARY_OUTPUT_DIRECTORY) + set(UPDATE_PATH_COMMAND set "PATH=${_QT_LIBRARY_PATH}\;${_QBS_LIBRARY_PATH}\;%PATH%") else() set(UPDATE_PATH_COMMAND "") endif() |