File tree 3 files changed +20
-41
lines changed
3 files changed +20
-41
lines changed Original file line number Diff line number Diff line change @@ -98,7 +98,9 @@ set(KNOWN_WARNINGS
98
98
-Wno-error=unused-function \
99
99
-Wno-error=unused-variable \
100
100
-Wno-strict-aliasing \
101
- -Wno-ignored-qualifiers" )
101
+ -Wno-ignored-qualifiers \
102
+ -Wno-deprecated-declarations \
103
+ -Wno-attributes" )
102
104
103
105
if ("${CMAKE_CXX_COMPILER_ID} " STREQUAL "GNU" )
104
106
set (KNOWN_WARNINGS "-Wno-error=unused-but-set-variable \
@@ -141,8 +143,25 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
141
143
add_compile_definitions (_GNU_SOURCE)
142
144
endif ()
143
145
146
+ if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" )
147
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-class-memaccess" )
148
+ endif ()
149
+
144
150
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KNOWN_WARNINGS} " )
145
151
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
+
146
165
#
147
166
# Dependencies
148
167
#
Original file line number Diff line number Diff line change @@ -22,28 +22,6 @@ include(FindPkgConfig)
22
22
include (GNUInstallDirs)
23
23
include (CheckCXXCompilerFlag)
24
24
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} " )
47
25
message ("Core module final CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} " )
48
26
49
27
set (BOOST_MIN_VERSION "1.42.0" )
Original file line number Diff line number Diff line change @@ -23,12 +23,6 @@ include(GNUInstallDirs)
23
23
include (CheckCXXCompilerFlag)
24
24
include (FindPackageHandleStandardArgs)
25
25
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
-
32
26
set (SYSTEM_LIB_PATH
33
27
"/usr/lib"
34
28
CACHE PATH "System Lib dir" )
@@ -62,18 +56,6 @@ if(NOT DEFINED VELOX_HOME)
62
56
message (STATUS "Set VELOX_HOME to ${VELOX_HOME} " )
63
57
endif ()
64
58
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
-
77
59
message ("Velox module final CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} " )
78
60
79
61
# User can specify VELOX_BUILD_PATH, if Velox are built elsewhere.
You can’t perform that action at this time.
0 commit comments