diff options
author | Eike Ziller <eike.ziller@qt.io> | 2021-05-10 13:54:19 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2021-05-20 10:03:11 +0000 |
commit | 759e15dbb4d3262e174d0d5ef15db355e2b18878 (patch) | |
tree | c20a9a52589336709c576a0d945305884f49e419 /src/libs/CMakeLists.txt | |
parent | 2c8a9a67610c38e86ca0c2b59b3fa7a3834915ca (diff) |
CMake build: put .lib files next to .dll files for libraries
- there is no reason for putting them elsewhere
- since CMake file-api only reports the .lib location for linked
libraries, Qt Creator has difficulties with adding the correct
PATH for running e.g. manual tests, when the .lib files are at
an arbitrary location
Fixes: QTCREATORBUG-25684
Change-Id: I24b26a79c70fd5384f534f8f0b66b51fca1ecc56
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/libs/CMakeLists.txt')
-rw-r--r-- | src/libs/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt index 7907d8272a..920f1607dd 100644 --- a/src/libs/CMakeLists.txt +++ b/src/libs/CMakeLists.txt @@ -25,6 +25,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/qlitehtml/src/CMakeLists.txt) if(BUILD_LIBRARY_QLITEHTML) set(QLITEHTML_BIN_PATH ${IDE_BIN_PATH}) set(QLITEHTML_LIBRARY_PATH ${IDE_LIBRARY_PATH}) + set(QLITEHTML_LIBRARY_ARCHIVE_PATH ${IDE_LIBRARY_ARCHIVE_PATH}) set(QLITEHTML_EXPORT QtCreator) set(QLITEHTML_DEVEL_COMPONENT Devel) set(QLITEHTML_DEVEL_EXCLUDE_FROM_ALL ON) @@ -42,7 +43,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/qlitehtml/src/CMakeLists.txt) INSTALL_RPATH "${_LIB_RPATH}" RUNTIME_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_BIN_PATH}" LIBRARY_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_LIBRARY_PATH}" - ARCHIVE_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_LIBRARY_PATH}" + ARCHIVE_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_LIBRARY_ARCHIVE_PATH}" ) endif() endif() |