Skip to content

Commit

Permalink
[native] Cleanup Makefile CMAKE_FLAGS
Browse files Browse the repository at this point in the history
Some of the CMAKE options such as PRESTO_ENABLE_PARQUET have special Makefile variables and
are appended to CMAKE_FLAGS.
The remaining CMAKE options are expected to use EXTRA_CMAKE_FLAGS.
This requires Dockerfiles to provide these special variables.
Add all CMAKE options to EXTRA_CMAKE_FLAGS.
  • Loading branch information
majetideepak committed May 15, 2024
1 parent ae9b2b1 commit 941068b
Showing 1 changed file with 16 additions and 10 deletions.
26 changes: 16 additions & 10 deletions presto-native-execution/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,28 @@ CPU_TARGET ?= "avx"
CMAKE_PREFIX_PATH ?= "/usr/local"
PRESTOCPP_ROOT_DIR="$(shell pwd)"

PRESTO_ENABLE_PARQUET ?= "OFF"
PRESTO_ENABLE_S3 ?= "OFF"
PRESTO_ENABLE_HDFS ?= "OFF"
PRESTO_ENABLE_REMOTE_FUNCTIONS ?= "OFF"
PRESTO_ENABLE_JWT ?= "OFF"
EXTRA_CMAKE_FLAGS ?= ""

ifeq ($(PRESTO_ENABLE_PARQUET), ON)
EXTRA_CMAKE_FLAGS += -DPRESTO_ENABLE_PARQUET=ON
endif
ifeq ($(PRESTO_ENABLE_S3), ON)
EXTRA_CMAKE_FLAGS += -DPRESTO_ENABLE_S3=ON
endif
ifeq ($(PRESTO_ENABLE_HDFS), ON)
EXTRA_CMAKE_FLAGS += -DPRESTO_ENABLE_HDFS=ON
endif
ifeq ($(PRESTO_ENABLE_REMOTE_FUNCTIONS), ON)
EXTRA_CMAKE_FLAGS += -DPRESTO_ENABLE_REMOTE_FUNCTIONS=ON
endif
ifeq ($(PRESTO_ENABLE_JWT), ON)
EXTRA_CMAKE_FLAGS += -DPRESTO_ENABLE_JWT=ON
endif

CMAKE_FLAGS := -DTREAT_WARNINGS_AS_ERRORS=${TREAT_WARNINGS_AS_ERRORS}
CMAKE_FLAGS += -DENABLE_ALL_WARNINGS=${ENABLE_WALL}
CMAKE_FLAGS += -DCMAKE_PREFIX_PATH=$(CMAKE_PREFIX_PATH)
CMAKE_FLAGS += -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
CMAKE_FLAGS += -DPRESTO_ENABLE_PARQUET=$(PRESTO_ENABLE_PARQUET)
CMAKE_FLAGS += -DPRESTO_ENABLE_S3=$(PRESTO_ENABLE_S3)
CMAKE_FLAGS += -DPRESTO_ENABLE_HDFS=$(PRESTO_ENABLE_HDFS)
CMAKE_FLAGS += -DPRESTO_ENABLE_REMOTE_FUNCTIONS=$(PRESTO_ENABLE_REMOTE_FUNCTIONS)
CMAKE_FLAGS += -DPRESTO_ENABLE_JWT=$(PRESTO_ENABLE_JWT)

SHELL := /bin/bash

Expand Down

0 comments on commit 941068b

Please sign in to comment.