mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 06:29:05 +08:00
3bffe1c049
* [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. * [qt5] update and remove patches * [baseline] skip qt5-canvas3d due to deprecation * [qwt] update to 6.1.4 and fix build issues * [qt5-webengine] remove old patches * [qwt] fix static patch * [qt5-location] add a message that the port has a sprious failure * [qt5-webengine] fix filename of patch * [qt5-webengine] add build.patch (ci is probably fast than me in checking for more errors) * [qt5-winextras] depend on qt5-base[core] Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [qt5-base] update latest feature (latest=core) * [baseline] remove qt5-webengine for nonstatic windows since CI can handle it now * [qt5-base] make qt5-base fail to get logs. * [angle] include missing egl sources. * [qt5-base] patch egl detection logic. * [baseline] remove qt-x11extras:x64-linux=fail * [qt5-base] need to be explicit about xcb to build qt5-x11extras * [CI] add necessary system libraries to linux CI * [qt5-base] remove comment to retry on linux * [qt5-base] add static_init patch for MSVC * [qt5-base] refined workaround to not regress linux and osx due to * [paraview] remove unnecessary patches with newer qt versions * [vcpkg/baseline] add webengine back to skip * [vtk] fix missing include regression using patch from upstream * [vtk] fix patch * [qt5-base] replace with patch from upstream * [paraview] use hdf5 1.10 api. * [paraview] bump control * Add more packages to Linux machines. * [qt5-base] forgot to add the patch * Delete 6943.diff Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
|
|
index 4aa5dad46..cee6d2882 100644
|
|
--- a/mkspecs/features/create_cmake.prf
|
|
+++ b/mkspecs/features/create_cmake.prf
|
|
@@ -212,10 +212,10 @@ contains(CONFIG, plugin) {
|
|
CMAKE_PLUGIN_TYPE_ESCAPED = $$replace(PLUGIN_TYPE, [-/], _)
|
|
|
|
win32 {
|
|
- !mingw|qtConfig(debug_and_release): debug_suffix="d"
|
|
+ debug_suffix="d"
|
|
|
|
CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl
|
|
CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl
|
|
|
|
isEmpty(CMAKE_STATIC_TYPE) {
|
|
CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.dll
|
|
@@ -295,6 +295,7 @@ CMAKE_INTERFACE_QT5_MODULE_DEPS = $$join(aux_lib_deps, ";")
|
|
equals(TEMPLATE, aux): CMAKE_FEATURE_PROPERTY_PREFIX = "INTERFACE_"
|
|
|
|
mac {
|
|
+ CMAKE_FIND_OTHER_LIBRARY_BUILD = "true"
|
|
!isEmpty(CMAKE_STATIC_TYPE) {
|
|
CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a
|
|
CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
|
|
@@ -315,7 +316,7 @@ mac {
|
|
CMAKE_WINDOWS_BUILD = "true"
|
|
CMAKE_FIND_OTHER_LIBRARY_BUILD = "true"
|
|
|
|
- !mingw|qtConfig(debug_and_release): debug_suffix="d"
|
|
+ debug_suffix="d"
|
|
|
|
CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
|
|
CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
|
|
@@ -342,6 +342,7 @@ mac {
|
|
CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
|
|
}
|
|
} else {
|
|
+ CMAKE_FIND_OTHER_LIBRARY_BUILD = "true"
|
|
!isEmpty(CMAKE_STATIC_TYPE) {
|
|
CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
|
|
CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
|