Skip to content

Commit 8b64f82

Browse files
jhauglidjhauglid
committed
Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANG
Bug#17959689: MAKE GCC AND CLANG GIVE CONSISTENT COMPILATION WARNINGS Bug#18313717: ENABLE -WERROR IN MAINTANER MODE WHEN COMPILING WITH CLANG Bug#18510941: REMOVE CMAKE WORKAROUNDS FOR OLDER VERSIONS OF OS X/XCODE Backport from mysql-5.6 to mysql-5.5
1 parent a3cc647 commit 8b64f82

13 files changed

Lines changed: 187 additions & 117 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 53 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ ENDIF()
2727

2828
# We use the LOCATION target property (CMP0026)
2929
# and get_target_property() for non-existent targets (CMP0045)
30+
# and INSTALL_NAME_DIR (CMP0042)
3031
IF(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR
3132
CMAKE_VERSION VERSION_GREATER "3.0.0")
3233
CMAKE_POLICY(SET CMP0026 OLD)
3334
CMAKE_POLICY(SET CMP0045 OLD)
35+
CMAKE_POLICY(SET CMP0042 OLD)
3436
ENDIF()
3537

3638
MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
@@ -73,11 +75,9 @@ ENDIF()
7375
SET(BUILDTYPE_DOCSTRING
7476
"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
7577
CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel")
76-
78+
7779
IF(WITH_DEBUG)
7880
SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING ${BUILDTYPE_DOCSTRING} FORCE)
79-
SET(MYSQL_MAINTAINER_MODE ON CACHE BOOL
80-
"MySQL maintainer-specific development environment")
8181
IF(UNIX AND NOT APPLE)
8282
# Compiling with PIC speeds up embedded build, on PIC sensitive systems
8383
# Predefine it to ON, in case user chooses to build embedded.
@@ -107,6 +107,15 @@ ELSE()
107107
ENDIF()
108108
PROJECT(${MYSQL_PROJECT_NAME})
109109

110+
# Maintainer mode is default on only for Linux debug builds using GCC/G++
111+
IF(CMAKE_BUILD_TYPE MATCHES "Debug" OR WITH_DEBUG)
112+
IF(CMAKE_SYSTEM_NAME MATCHES "Linux" AND
113+
CMAKE_COMPILER_IS_GNUCC AND CMAKE_COMPILER_IS_GNUCXX)
114+
SET(MYSQL_MAINTAINER_MODE ON CACHE BOOL
115+
"MySQL maintainer-specific development environment")
116+
ENDIF()
117+
ENDIF()
118+
110119
IF(BUILD_CONFIG)
111120
INCLUDE(
112121
${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)
@@ -130,38 +139,12 @@ FOREACH(_base
130139
ENDFOREACH()
131140

132141

133-
134142
# Following autotools tradition, add preprocessor definitions
135143
# specified in environment variable CPPFLAGS
136144
IF(DEFINED ENV{CPPFLAGS})
137145
ADD_DEFINITIONS($ENV{CPPFLAGS})
138146
ENDIF()
139147

140-
#
141-
# Control aspects of the development environment which are
142-
# specific to MySQL maintainers and developers.
143-
#
144-
INCLUDE(maintainer)
145-
146-
OPTION(MYSQL_MAINTAINER_MODE
147-
"MySQL maintainer-specific development environment" OFF)
148-
149-
# Whether the maintainer mode compiler options should be enabled.
150-
IF(MYSQL_MAINTAINER_MODE)
151-
IF(CMAKE_C_COMPILER_ID MATCHES "GNU")
152-
SET_MYSQL_MAINTAINER_GNU_C_OPTIONS()
153-
ENDIF()
154-
IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
155-
SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS()
156-
ENDIF()
157-
IF(CMAKE_C_COMPILER_ID MATCHES "Intel")
158-
SET_MYSQL_MAINTAINER_INTEL_C_OPTIONS()
159-
ENDIF()
160-
IF(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
161-
SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS()
162-
ENDIF()
163-
ENDIF()
164-
165148
# Add macros
166149
INCLUDE(character_sets)
167150
INCLUDE(zlib)
@@ -192,7 +175,6 @@ OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON)
192175
MARK_AS_ADVANCED(CYBOZU BACKUP_TEST WITHOUT_SERVER DISABLE_SHARED)
193176

194177

195-
196178
include(CheckCSourceCompiles)
197179
include(CheckCXXSourceCompiles)
198180
# We need some extra FAIL_REGEX patterns
@@ -373,13 +355,13 @@ MYSQL_CHECK_READLINE()
373355
# not run with the warning options as to not perturb fragile checks
374356
# (i.e. do not make warnings into errors).
375357
#
376-
IF(MYSQL_MAINTAINER_MODE)
377-
# Set compiler flags required under maintainer mode.
378-
MESSAGE(STATUS "C warning options: ${MY_MAINTAINER_C_WARNINGS}")
379-
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_MAINTAINER_C_WARNINGS}")
380-
MESSAGE(STATUS "C++ warning options: ${MY_MAINTAINER_CXX_WARNINGS}")
381-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_MAINTAINER_CXX_WARNINGS}")
382-
ENDIF()
358+
# Why doesn't these flags affect the entire build?
359+
# Because things may already have been included with ADD_SUBDIRECTORY
360+
#
361+
OPTION(MYSQL_MAINTAINER_MODE
362+
"MySQL maintainer-specific development environment" OFF)
363+
364+
INCLUDE(maintainer)
383365

384366
IF(NOT WITHOUT_SERVER)
385367
SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
@@ -395,7 +377,6 @@ ADD_SUBDIRECTORY(regex)
395377
ADD_SUBDIRECTORY(mysys)
396378
ADD_SUBDIRECTORY(libmysql)
397379

398-
399380
IF(WITH_UNIT_TESTS)
400381
ENABLE_TESTING()
401382
ENDIF()
@@ -487,7 +468,6 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
487468
)
488469
INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
489470
INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
490-
491471
IF(UNIX)
492472
INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
493473
ENDIF()
@@ -507,3 +487,37 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
507487
ENDIF()
508488

509489
INCLUDE(CPack)
490+
491+
# C compiler flags consist of:
492+
# CPPFLAGS Taken from environment, see above.
493+
# ADD_DEFINITIONS In each individual CMakeLists.txt
494+
# CMAKE_C_FLAGS From command line.
495+
# We extend these in maintainer.cmake
496+
# ENV{CFLAGS} From environment, but environment is ignored if
497+
# CMAKE_C_FLAGS is also given on command line
498+
# CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}
499+
# We extend these in compiler_options.cmake
500+
#
501+
# Note that CMakeCache.txt contains cmake builtins for these variables,
502+
# *not* the values that will actually be used:
503+
504+
IF(CMAKE_GENERATOR MATCHES "Makefiles")
505+
MESSAGE(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
506+
ENDIF()
507+
GET_PROPERTY(cwd_definitions DIRECTORY PROPERTY COMPILE_DEFINITIONS)
508+
MESSAGE(STATUS "COMPILE_DEFINITIONS: ${cwd_definitions}")
509+
MESSAGE(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
510+
MESSAGE(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
511+
IF(CMAKE_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Makefiles")
512+
STRING(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKEBT)
513+
MESSAGE(STATUS "CMAKE_C_FLAGS_${CMAKEBT}: ${CMAKE_C_FLAGS_${CMAKEBT}}")
514+
MESSAGE(STATUS "CMAKE_CXX_FLAGS_${CMAKEBT}: ${CMAKE_CXX_FLAGS_${CMAKEBT}}")
515+
ENDIF()
516+
IF(NOT CMAKE_GENERATOR MATCHES "Makefiles")
517+
MESSAGE(STATUS "CMAKE_C_FLAGS_DEBUG: ${CMAKE_C_FLAGS_DEBUG}")
518+
MESSAGE(STATUS "CMAKE_CXX_FLAGS_DEBUG: ${CMAKE_CXX_FLAGS_DEBUG}")
519+
MESSAGE(STATUS
520+
"CMAKE_C_FLAGS_RELWITHDEBINFO: ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
521+
MESSAGE(STATUS
522+
"CMAKE_CXX_FLAGS_RELWITHDEBINFO: ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
523+
ENDIF()

‎client/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ ENDIF(UNIX)
3535

3636
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
3737
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
38+
# mysqltest has unused result errors, so we skip Werror
39+
CHECK_C_COMPILER_FLAG("-Werror" HAVE_WERROR_FLAG)
40+
IF(HAVE_WERROR_FLAG)
41+
INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
42+
ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
43+
ENDIF()
3844
TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
3945

4046

‎cmake/build_configurations/mysql_release.cmake‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,16 @@ IF(UNIX)
189189
ENDIF()
190190
ENDIF()
191191

192-
# OSX flags
193-
IF(APPLE)
194-
SET(COMMON_C_FLAGS "-g -fno-common -fno-strict-aliasing")
195-
# XXX: why are we using -felide-constructors on OSX?
196-
SET(COMMON_CXX_FLAGS "-g -fno-common -felide-constructors -fno-strict-aliasing")
197-
SET(CMAKE_C_FLAGS_DEBUG "-O ${COMMON_C_FLAGS}")
198-
SET(CMAKE_CXX_FLAGS_DEBUG "-O ${COMMON_CXX_FLAGS}")
199-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-Os ${COMMON_C_FLAGS}")
200-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Os ${COMMON_CXX_FLAGS}")
192+
# Default Clang flags
193+
IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
194+
SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
195+
SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
196+
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
197+
ENDIF()
198+
IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
199+
SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
200+
SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
201+
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
201202
ENDIF()
202203

203204
# Solaris flags

‎cmake/compile_flags.cmake‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
2+
#
3+
# This program is free software; you can redistribute it and/or modify
4+
# it under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; version 2 of the License.
6+
#
7+
# This program is distributed in the hope that it will be useful,
8+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
# GNU General Public License for more details.
11+
#
12+
# You should have received a copy of the GNU General Public License
13+
# along with this program; if not, write to the Free Software
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
16+
17+
## ADD_COMPILE_FLAGS(<source files> COMPILE_FLAGS <flags>)
18+
MACRO(ADD_COMPILE_FLAGS)
19+
SET(FILES "")
20+
SET(FLAGS "")
21+
SET(COMPILE_FLAGS)
22+
FOREACH(ARG ${ARGV})
23+
IF(ARG STREQUAL "COMPILE_FLAGS")
24+
SET(COMPILE_FLAGS "COMPILE_FLAGS")
25+
ELSEIF(COMPILE_FLAGS)
26+
LIST(APPEND FLAGS ${ARG})
27+
ELSE()
28+
LIST(APPEND FILES ${ARG})
29+
ENDIF()
30+
ENDFOREACH()
31+
FOREACH(FILE ${FILES})
32+
FOREACH(FLAG ${FLAGS})
33+
GET_SOURCE_FILE_PROPERTY(PROP ${FILE} COMPILE_FLAGS)
34+
IF(NOT PROP)
35+
SET(PROP ${FLAG})
36+
ELSE()
37+
SET(PROP "${PROP} ${FLAG}")
38+
ENDIF()
39+
SET_SOURCE_FILES_PROPERTIES(
40+
${FILE} PROPERTIES COMPILE_FLAGS "${PROP}"
41+
)
42+
ENDFOREACH()
43+
ENDFOREACH()
44+
ENDMACRO()

‎cmake/maintainer.cmake‎

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
@@ -13,42 +13,39 @@
1313
# along with this program; if not, write to the Free Software
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

16-
INCLUDE(CheckCCompilerFlag)
16+
# Common warning flags for GCC, G++, Clang and Clang++
17+
SET(MY_WARNING_FLAGS "-Wall -Wextra -Wformat-security")
18+
MY_CHECK_C_COMPILER_FLAG("-Wvla" HAVE_WVLA) # Requires GCC 4.3+ or Clang
19+
IF(HAVE_WVLA)
20+
SET(MY_WARNING_FLAGS "${MY_WARNING_FLAGS} -Wvla")
21+
ENDIF()
1722

18-
# Setup GCC (GNU C compiler) warning options.
19-
MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS)
20-
SET(MY_MAINTAINER_WARNINGS
21-
"-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror")
22-
CHECK_C_COMPILER_FLAG("-Wdeclaration-after-statement"
23-
HAVE_DECLARATION_AFTER_STATEMENT)
24-
IF(HAVE_DECLARATION_AFTER_STATEMENT)
25-
SET(MY_MAINTAINER_DECLARATION_AFTER_STATEMENT
26-
"-Wdeclaration-after-statement")
27-
ENDIF()
28-
SET(MY_MAINTAINER_C_WARNINGS
29-
"${MY_MAINTAINER_WARNINGS} ${MY_MAINTAINER_DECLARATION_AFTER_STATEMENT}"
30-
CACHE STRING "C warning options used in maintainer builds.")
31-
# Do not make warnings in checks into errors.
32-
SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Wno-error")
33-
ENDMACRO()
23+
# Common warning flags for GCC and Clang
24+
SET(MY_C_WARNING_FLAGS
25+
"${MY_WARNING_FLAGS} -Wwrite-strings -Wdeclaration-after-statement")
3426

35-
# Setup G++ (GNU C++ compiler) warning options.
36-
MACRO(SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS)
37-
SET(MY_MAINTAINER_CXX_WARNINGS
38-
"${MY_MAINTAINER_WARNINGS} -Wno-unused-parameter -Woverloaded-virtual"
39-
CACHE STRING "C++ warning options used in maintainer builds.")
40-
ENDMACRO()
27+
# Common warning flags for G++ and Clang++
28+
SET(MY_CXX_WARNING_FLAGS
29+
"${MY_WARNING_FLAGS} -Woverloaded-virtual -Wno-unused-parameter")
4130

42-
# Setup ICC (Intel C Compiler) warning options.
43-
MACRO(SET_MYSQL_MAINTAINER_INTEL_C_OPTIONS)
44-
SET(MY_MAINTAINER_WARNINGS "-Wcheck")
45-
SET(MY_MAINTAINER_C_WARNINGS "${MY_MAINTAINER_WARNINGS}"
46-
CACHE STRING "C warning options used in maintainer builds.")
47-
ENDMACRO()
31+
# Extra warning flags for Clang++
32+
IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
33+
SET(MY_CXX_WARNING_FLAGS
34+
"${MY_CXX_WARNING_FLAGS} -Wno-null-conversion -Wno-unused-private-field")
35+
ENDIF()
4836

49-
# Setup ICPC (Intel C++ Compiler) warning options.
50-
MACRO(SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS)
51-
SET(MY_MAINTAINER_CXX_WARNINGS "${MY_MAINTAINER_WARNINGS}"
52-
CACHE STRING "C++ warning options used in maintainer builds.")
53-
ENDMACRO()
37+
# Turn on Werror (warning => error) when using maintainer mode.
38+
IF(MYSQL_MAINTAINER_MODE)
39+
SET(MY_C_WARNING_FLAGS "${MY_C_WARNING_FLAGS} -Werror")
40+
SET(MY_CXX_WARNING_FLAGS "${MY_CXX_WARNING_FLAGS} -Werror")
41+
SET(COMPILE_FLAG_WERROR 1)
42+
ENDIF()
5443

44+
# Set warning flags for GCC/Clang
45+
IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
46+
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_WARNING_FLAGS}")
47+
ENDIF()
48+
# Set warning flags for G++/Clang++
49+
IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
50+
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_CXX_WARNING_FLAGS}")
51+
ENDIF()

‎cmake/os/Darwin.cmake‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# Copyright (c) 2010 Sun Microsystems, Inc.
2-
# Use is subject to license terms.
1+
# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
32
#
43
# This program is free software; you can redistribute it and/or modify
54
# it under the terms of the GNU General Public License as published by
@@ -15,21 +14,3 @@
1514
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1615

1716
# This file includes OSX specific options and quirks, related to system checks
18-
19-
# Workaround for CMake bug#9051
20-
# (CMake does not pass CMAKE_OSX_SYSROOT and CMAKE_OSX_DEPLOYMENT_TARGET when
21-
# running TRY_COMPILE)
22-
23-
IF(CMAKE_OSX_SYSROOT)
24-
SET(ENV{CMAKE_OSX_SYSROOT} ${CMAKE_OSX_SYSROOT})
25-
ENDIF()
26-
IF(CMAKE_OSX_SYSROOT)
27-
SET(ENV{MACOSX_DEPLOYMENT_TARGET} ${OSX_DEPLOYMENT_TARGET})
28-
ENDIF()
29-
30-
IF(CMAKE_OSX_DEPLOYMENT_TARGET)
31-
# Workaround linker problems on OSX 10.4
32-
IF(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS "10.5")
33-
ADD_DEFINITIONS(-fno-common)
34-
ENDIF()
35-
ENDIF()

‎configure.cmake‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,6 @@ IF(NOT SYSTEM_TYPE)
5353
ENDIF()
5454

5555

56-
# Always enable -Wall for gnu C/C++
57-
IF(CMAKE_COMPILER_IS_GNUCXX)
58-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-parameter")
59-
ENDIF()
60-
IF(CMAKE_COMPILER_IS_GNUCC)
61-
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
62-
ENDIF()
63-
64-
6556
IF(CMAKE_COMPILER_IS_GNUCXX)
6657
# MySQL "canonical" GCC flags. At least -fno-rtti flag affects
6758
# ABI and cannot be simply removed.

‎libmysqld/CMakeLists.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,14 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
9393
)
9494

9595

96+
# These files have unused result errors, so we skip Werror
97+
CHECK_C_COMPILER_FLAG("-Werror" HAVE_WERROR_FLAG)
98+
IF(HAVE_WERROR_FLAG)
99+
INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
100+
ADD_COMPILE_FLAGS(../sql/filesort.cc COMPILE_FLAGS "-Wno-error")
101+
ADD_COMPILE_FLAGS(../sql/opt_range.cc COMPILE_FLAGS "-Wno-error")
102+
ENDIF()
103+
96104
ADD_CONVENIENCE_LIBRARY(sql_embedded ${SQL_EMBEDDED_SOURCES})
97105
DTRACE_INSTRUMENT(sql_embedded)
98106
ADD_DEPENDENCIES(sql_embedded GenError GenServerSource)

0 commit comments

Comments
 (0)