diff --git a/ci/conan/all/conanfile.py b/ci/conan/all/conanfile.py index 0d82d98db3e..97acd839cd3 100644 --- a/ci/conan/all/conanfile.py +++ b/ci/conan/all/conanfile.py @@ -376,7 +376,7 @@ def _configure_cmake(self): self._cmake.definitions["ARROW_BROTLI_USE_SHARED"] = self.options["brotli"].shared self._cmake.definitions["gflags_SOURCE"] = "SYSTEM" if self._with_gflags(): - self._cmake.definitions["ARROW_BROTLI_USE_SHARED"] = self.options["gflags"].shared + self._cmake.definitions["ARROW_GFLAGS_USE_SHARED"] = self.options["gflags"].shared self._cmake.definitions["ARROW_WITH_BZ2"] = self.options.with_bz2 self._cmake.definitions["BZip2_SOURCE"] = "SYSTEM" if self.options.with_bz2: diff --git a/ci/scripts/conan_build.sh b/ci/scripts/conan_build.sh index 9a1ab77b827..11952509c88 100755 --- a/ci/scripts/conan_build.sh +++ b/ci/scripts/conan_build.sh @@ -31,6 +31,9 @@ conan_args=() if [ -n "${ARROW_CONAN_PARQUET:-}" ]; then conan_args+=(--options arrow:parquet=${ARROW_CONAN_PARQUET}) fi +if [ -n "${ARROW_CONAN_WITH_BROTLI:-}" ]; then + conan_args+=(--options arrow:with_brotli=${ARROW_CONAN_WITH_BROTLI}) +fi if [ -n "${ARROW_CONAN_WITH_JEMALLOC:-}" ]; then conan_args+=(--options arrow:with_jemalloc=${ARROW_CONAN_WITH_JEMALLOC}) fi diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index f52fe1428ad..71a60d24528 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -206,6 +206,7 @@ tasks: params: flags: >- -e ARROW_CONAN_PARQUET=True + -e ARROW_CONAN_WITH_BROTLI=True -e ARROW_CONAN_WITH_JEMALLOC=True -e ARROW_CONAN_WITH_LZ4=True -e ARROW_CONAN_WITH_SNAPPY=True