Skip to content

Commit bcb768b

Browse files
authored
[VL] Clean up duplicate CMake code for setting CMAKE_CXX_FLAGS (#8034)
1 parent 9f69d21 commit bcb768b

File tree

3 files changed

+20
-41
lines changed

3 files changed

+20
-41
lines changed

cpp/CMakeLists.txt

+20-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ set(KNOWN_WARNINGS
9898
-Wno-error=unused-function \
9999
-Wno-error=unused-variable \
100100
-Wno-strict-aliasing \
101-
-Wno-ignored-qualifiers")
101+
-Wno-ignored-qualifiers \
102+
-Wno-deprecated-declarations \
103+
-Wno-attributes")
102104

103105
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
104106
set(KNOWN_WARNINGS "-Wno-error=unused-but-set-variable \
@@ -141,8 +143,25 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
141143
add_compile_definitions(_GNU_SOURCE)
142144
endif()
143145

146+
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
147+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-class-memaccess")
148+
endif()
149+
144150
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KNOWN_WARNINGS}")
145151

152+
# Keep same compile option with Velox.
153+
execute_process(
154+
COMMAND
155+
bash -c
156+
"( source ${VELOX_HOME}/scripts/setup-helper-functions.sh && echo -n $(get_cxx_flags $ENV{CPU_TARGET}))"
157+
OUTPUT_VARIABLE SCRIPT_CXX_FLAGS
158+
RESULT_VARIABLE COMMAND_STATUS)
159+
if(COMMAND_STATUS EQUAL "1")
160+
message(FATAL_ERROR "Unable to determine compiler flags!")
161+
endif()
162+
163+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SCRIPT_CXX_FLAGS}")
164+
146165
#
147166
# Dependencies
148167
#

cpp/core/CMakeLists.txt

-22
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,6 @@ include(FindPkgConfig)
2222
include(GNUInstallDirs)
2323
include(CheckCXXCompilerFlag)
2424

25-
set(CMAKE_CXX_FLAGS
26-
"${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations -Wno-attributes")
27-
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
28-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-class-memaccess")
29-
endif()
30-
31-
if(NOT DEFINED VELOX_HOME)
32-
set(VELOX_HOME ${GLUTEN_HOME}/ep/build-velox/build/velox_ep)
33-
message(STATUS "Set VELOX_HOME to ${VELOX_HOME}")
34-
endif()
35-
36-
# Keep same compile option with Velox.
37-
execute_process(
38-
COMMAND
39-
bash -c
40-
"( source ${VELOX_HOME}/scripts/setup-helper-functions.sh && echo -n $(get_cxx_flags $ENV{CPU_TARGET}))"
41-
OUTPUT_VARIABLE SCRIPT_CXX_FLAGS
42-
RESULT_VARIABLE COMMAND_STATUS)
43-
if(COMMAND_STATUS EQUAL "1")
44-
message(FATAL_ERROR "Unable to determine compiler flags!")
45-
endif()
46-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SCRIPT_CXX_FLAGS}")
4725
message("Core module final CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}")
4826

4927
set(BOOST_MIN_VERSION "1.42.0")

cpp/velox/CMakeLists.txt

-18
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ include(GNUInstallDirs)
2323
include(CheckCXXCompilerFlag)
2424
include(FindPackageHandleStandardArgs)
2525

26-
set(CMAKE_CXX_FLAGS
27-
"${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations -Wno-attributes")
28-
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
29-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-class-memaccess")
30-
endif()
31-
3226
set(SYSTEM_LIB_PATH
3327
"/usr/lib"
3428
CACHE PATH "System Lib dir")
@@ -62,18 +56,6 @@ if(NOT DEFINED VELOX_HOME)
6256
message(STATUS "Set VELOX_HOME to ${VELOX_HOME}")
6357
endif()
6458

65-
# Keep same compile option with Velox.
66-
execute_process(
67-
COMMAND
68-
bash -c
69-
"( source ${VELOX_HOME}/scripts/setup-helper-functions.sh && echo -n $(get_cxx_flags $ENV{CPU_TARGET}))"
70-
OUTPUT_VARIABLE SCRIPT_CXX_FLAGS
71-
RESULT_VARIABLE COMMAND_STATUS)
72-
if(COMMAND_STATUS EQUAL "1")
73-
message(FATAL_ERROR "Unable to determine compiler flags!")
74-
endif()
75-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SCRIPT_CXX_FLAGS}")
76-
7759
message("Velox module final CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}")
7860

7961
# User can specify VELOX_BUILD_PATH, if Velox are built elsewhere.

0 commit comments

Comments
 (0)