mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-16 03:19:05 +08:00
45f34d72b9
* [Qt] Update to 6.6.0 * fix patch in qtbase * add tmp port to get qtwebengine logs * remove dep in tmp port * Fix CMAKE_BUILD_TYPE being hijacked by qt scripts. * Fix qtwebengine build? * add another script to be fixed * remove path to cmake * fix qtgrpc * looks like the variable is defined somewhere. * avoid aliasing only if the target exists * try different aliasing fix * fix patch * Dep stuff * reenable atomics * reenable librt * remove tmp * v db * v db * add vulkan-header as a dependency * v db * also needs libs * v db * add a comment to remember me not to touch this again * v db
24 lines
765 B
Diff
24 lines
765 B
Diff
diff --git a/cmake/FindWrapProtoc.cmake b/cmake/FindWrapProtoc.cmake
|
|
index 82972c8f18..08335fa746 100644
|
|
--- a/cmake/FindWrapProtoc.cmake
|
|
+++ b/cmake/FindWrapProtoc.cmake
|
|
@@ -13,7 +13,7 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
|
|
list(APPEND __WrapProtoc_find_package_args QUIET)
|
|
endif()
|
|
|
|
-if(NOT CMAKE_CROSSCOMPILING)
|
|
+if(0)
|
|
if(NOT TARGET Threads::Threads)
|
|
find_package(Threads ${__WrapProtoc_find_package_args})
|
|
endif()
|
|
@@ -52,8 +52,8 @@ if(NOT CMAKE_CROSSCOMPILING)
|
|
endif()
|
|
endif()
|
|
|
|
-if(NOT __WrapProtoc_protoc_imported_location)
|
|
+if(1)
|
|
if(CMAKE_CROSSCOMPILING)
|
|
set(__WrapProtoc_extra_prefix_paths "${QT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH}")
|
|
endif()
|
|
find_program(__WrapProtoc_protoc_imported_location
|