Change order of conan dependency to fix Windows build

google · Oct 4, 2023 · e96014a · e96014a
1 parent 3e1d053
commit e96014a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/conanfile.py b/conanfile.py
@@ -49,8 +49,8 @@ def config_options(self):
 
     def build_requirements(self):
         if self.options.with_system_deps: return
-        self.build_requires('protobuf/3.21.4')
         self.build_requires('grpc/1.48.0')
+        self.build_requires('protobuf/3.21.4')
         self.build_requires('gtest/1.11.0', force_host_context=True)
 
     def requirements(self):

diff --git a/src/Api/Orbit.cpp b/src/Api/Orbit.cpp
@@ -19,6 +19,8 @@
 #include "ApiUtils/ApiEnableInfo.h"
 #endif
 
+// Kick build.
+
 namespace {
 orbit_api::LockFreeApiEventProducer& GetCaptureEventProducer() {
   static orbit_api::LockFreeApiEventProducer producer;