diff --git a/CMakeLists.txt b/CMakeLists.txt index e5eecf939..d5873ee0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,6 +45,7 @@ if(NOT PROXYGEN_GPERF) endif() # Dependencies +find_package(fmt REQUIRED) find_package(folly REQUIRED) find_package(wangle REQUIRED) find_package(Fizz REQUIRED) diff --git a/build/fbcode_builder/specs/fbthrift.py b/build/fbcode_builder/specs/fbthrift.py index fb6777fea..b3342a597 100644 --- a/build/fbcode_builder/specs/fbthrift.py +++ b/build/fbcode_builder/specs/fbthrift.py @@ -5,9 +5,9 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -import specs.folly as folly import specs.fizz as fizz import specs.fmt as fmt +import specs.folly as folly import specs.rsocket as rsocket import specs.sodium as sodium import specs.wangle as wangle @@ -16,7 +16,7 @@ import specs.zstd as zstd def fbcode_builder_spec(builder): return { - 'depends_on': [folly, fizz, fmt, sodium, rsocket, wangle, zstd], + 'depends_on': [fmt, folly, fizz, sodium, rsocket, wangle, zstd], 'steps': [ builder.fb_github_cmake_install('fbthrift/thrift'), ], diff --git a/build/fbcode_builder/specs/fbzmq.py b/build/fbcode_builder/specs/fbzmq.py index f579b25b3..28aa17725 100644 --- a/build/fbcode_builder/specs/fbzmq.py +++ b/build/fbcode_builder/specs/fbzmq.py @@ -6,6 +6,7 @@ from __future__ import print_function from __future__ import unicode_literals import specs.fbthrift as fbthrift +import specs.fmt as fmt import specs.folly as folly import specs.gmock as gmock import specs.sodium as sodium @@ -17,7 +18,7 @@ from shell_quoting import ShellQuoted def fbcode_builder_spec(builder): builder.add_option('zeromq/libzmq:git_hash', 'v4.2.2') return { - 'depends_on': [folly, fbthrift, gmock, sodium, sigar], + 'depends_on': [fmt, folly, fbthrift, gmock, sodium, sigar], 'steps': [ builder.github_project_workdir('zeromq/libzmq', '.'), builder.step('Build and install zeromq/libzmq', [ diff --git a/build/fbcode_builder/specs/fizz.py b/build/fbcode_builder/specs/fizz.py index 4b6fd2200..b7828624f 100644 --- a/build/fbcode_builder/specs/fizz.py +++ b/build/fbcode_builder/specs/fizz.py @@ -5,6 +5,7 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals +import specs.fmt as fmt import specs.folly as folly import specs.sodium as sodium @@ -20,7 +21,7 @@ def fbcode_builder_spec(builder): } ) return { - 'depends_on': [folly, sodium], + 'depends_on': [fmt, folly, sodium], 'steps': [ builder.fb_github_cmake_install( 'fizz/fizz/build', diff --git a/build/fbcode_builder/specs/proxygen.py b/build/fbcode_builder/specs/proxygen.py index cec3f9190..ac694792c 100644 --- a/build/fbcode_builder/specs/proxygen.py +++ b/build/fbcode_builder/specs/proxygen.py @@ -5,6 +5,7 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals +import specs.fmt as fmt import specs.folly as folly import specs.fizz as fizz import specs.mvfst as mvfst @@ -26,6 +27,6 @@ def fbcode_builder_spec(builder): ) return { - "depends_on": [folly, wangle, fizz, sodium, zstd, mvfst], + "depends_on": [fmt, folly, wangle, fizz, sodium, zstd, mvfst], "steps": [builder.fb_github_cmake_install("proxygen/proxygen", "..")], } diff --git a/build/fbcode_builder/specs/rsocket.py b/build/fbcode_builder/specs/rsocket.py index 689dcbff9..ef9fd7675 100644 --- a/build/fbcode_builder/specs/rsocket.py +++ b/build/fbcode_builder/specs/rsocket.py @@ -6,12 +6,13 @@ from __future__ import print_function from __future__ import unicode_literals import specs.gmock as gmock +import specs.fmt as fmt import specs.folly as folly def fbcode_builder_spec(builder): return { - 'depends_on': [folly], + 'depends_on': [fmt, folly], 'steps': [ builder.fb_github_cmake_install( 'rsocket-cpp/rsocket', diff --git a/build/fbcode_builder/specs/wangle.py b/build/fbcode_builder/specs/wangle.py index c97d2441d..095716ece 100644 --- a/build/fbcode_builder/specs/wangle.py +++ b/build/fbcode_builder/specs/wangle.py @@ -5,6 +5,7 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals +import specs.fmt as fmt import specs.folly as folly import specs.fizz as fizz import specs.sodium as sodium @@ -20,7 +21,7 @@ def fbcode_builder_spec(builder): } ) return { - 'depends_on': [folly, fizz, sodium], + 'depends_on': [fmt, folly, fizz, sodium], 'steps': [ builder.fb_github_cmake_install('wangle/wangle/build'), ], diff --git a/build/fbcode_builder_config.py b/build/fbcode_builder_config.py index f0c4a8ba4..2e37e7739 100644 --- a/build/fbcode_builder_config.py +++ b/build/fbcode_builder_config.py @@ -8,6 +8,7 @@ from __future__ import absolute_import, division, print_function, unicode_literals import specs.fizz as fizz +import specs.fmt as fmt import specs.folly as folly import specs.mvfst as mvfst import specs.proxygen_quic as proxygen_quic @@ -22,7 +23,7 @@ from shell_quoting import ShellQuoted def fbcode_builder_spec(builder): return { - "depends_on": [folly, wangle, fizz, sodium, zstd, mvfst, proxygen_quic], + "depends_on": [fmt, folly, wangle, fizz, sodium, zstd, mvfst, proxygen_quic], "steps": [ # Tests for the full build with no QUIC/HTTP3 # Proxygen is the last step, so we are still in its working dir.