mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-19 12:14:10 +00:00
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
diff --git a/3rd-party/CMakeLists.txt b/3rd-party/CMakeLists.txt
|
||
|
|
index 188ebfc6..4a34a922 100644
|
||
|
|
--- a/3rd-party/CMakeLists.txt
|
||
|
|
+++ b/3rd-party/CMakeLists.txt
|
||
|
|
@@ -2,12 +2,8 @@ include(FetchContent)
|
||
|
|
set(FETCHCONTENT_QUIET FALSE)
|
||
|
|
|
||
|
|
FetchContent_Declare(gRPC
|
||
|
|
- GIT_REPOSITORY https://github.com/CanonicalLtd/grpc.git
|
||
|
|
- GIT_TAG ba8e7f72
|
||
|
|
- GIT_SHALLOW TRUE
|
||
|
|
- GIT_SUBMODULES "third_party/abseil-cpp third_party/cares/cares third_party/protobuf third_party/re2 third_party/zlib"
|
||
|
|
- GIT_SUBMODULES_RECURSE false
|
||
|
|
- GIT_PROGRESS TRUE
|
||
|
|
+ DOWNLOAD_COMMAND true
|
||
|
|
+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/grpc
|
||
|
|
)
|
||
|
|
set(gRPC_SSL_PROVIDER "package" CACHE STRING "Provider of ssl library")
|
||
|
|
|
||
|
|
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||
|
|
index 52bd407f..a1100112 100644
|
||
|
|
--- a/tests/CMakeLists.txt
|
||
|
|
+++ b/tests/CMakeLists.txt
|
||
|
|
@@ -28,7 +28,7 @@ FetchContent_Declare(googletest
|
||
|
|
)
|
||
|
|
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
|
||
|
|
set(INSTALL_GTEST OFF CACHE BOOL "")
|
||
|
|
-FetchContent_MakeAvailable(googletest)
|
||
|
|
+# FetchContent_MakeAvailable(googletest)
|
||
|
|
|
||
|
|
add_executable(multipass_tests
|
||
|
|
blueprint_test_lambdas.cpp
|