diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-06-30 01:33:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-29 16:33:19 -0700 |
| commit | 3b275f51385cbb7a4a1637cda281a6010ea65e12 (patch) | |
| tree | 964cb7e5b21260794dfc943c48c07e5fb79ac658 /ports/qt5-base/cmake | |
| parent | 1f01a1fd25a67e7a985998a38b4963f6e16310e2 (diff) | |
| download | vcpkg-3b275f51385cbb7a4a1637cda281a6010ea65e12.tar.gz vcpkg-3b275f51385cbb7a4a1637cda281a6010ea65e12.zip | |
[qt5-base] fix static init fiasco and fix debug dll's not being copied (#12153)
Diffstat (limited to 'ports/qt5-base/cmake')
| -rw-r--r-- | ports/qt5-base/cmake/qt_build_submodule.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake index f356d9f85..b30ef0299 100644 --- a/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -101,9 +101,7 @@ function(qt_build_submodule SOURCE_PATH) endif()
#This should be removed if somehow possible
- if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/tools/qt5/bin")
- file(COPY "${CURRENT_PACKAGES_DIR}/debug/tools/qt5/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug")
-
+ if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/qt5/debug/bin")
set(CURRENT_INSTALLED_DIR_BACKUP "${CURRENT_INSTALLED_DIR}")
set(CURRENT_INSTALLED_DIR "./../../../.." ) # Making the qt.conf relative and not absolute
configure_file(${CURRENT_INSTALLED_DIR_BACKUP}/tools/qt5/qt_debug.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/qt.conf) # This makes the tools at least useable for release
|