From 941068b657f5fbe3d17005dc543b158a7ce249a8 Mon Sep 17 00:00:00 2001
From: Deepak Majeti <deepak.majeti@ibm.com>
Date: Wed, 15 May 2024 13:18:08 -0400
Subject: [PATCH] [native] Cleanup Makefile CMAKE_FLAGS

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.
---
 presto-native-execution/Makefile | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/presto-native-execution/Makefile b/presto-native-execution/Makefile
index 89a5cedcc9ca6..c58ba47a25c6e 100644
--- a/presto-native-execution/Makefile
+++ b/presto-native-execution/Makefile
@@ -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