File tree 3 files changed +23
-10
lines changed
3 files changed +23
-10
lines changed Original file line number Diff line number Diff line change 28
28
29
29
30
30
31
- CMAKE_MINIMUM_REQUIRED (VERSION 3.8 )
31
+ CMAKE_MINIMUM_REQUIRED (VERSION 3.15 )
32
32
33
- cmake_policy (VERSION 3.0 )
33
+ cmake_policy (VERSION 3.15 )
34
34
35
35
if (POLICY CMP0022)
36
36
cmake_policy (SET CMP0022 NEW) # consistently use INTERFACE_LINK_LIBRARIES property
Original file line number Diff line number Diff line change 29
29
30
30
file (GLOB HEADERS *.h)
31
31
32
+ #TODO: Remove -Wno-delete-non-abstract-non-virtual-dtor when bumping ABI and
33
+ # adding virtual destructor for DbDoc, Value and Column_detail
34
+
35
+ if (CLANG)
36
+
37
+ set_compiler_flag(-Wno-delete-non-abstract -non-virtual-dtor)
38
+
39
+ # Note: GCC/clang and MSVC compilers have different rules for resolving
40
+ # relative paths in #include "..." directives [1]. The clang-cl compiler
41
+ # understands both conventions but gives warning when using MSVC rules. Since
42
+ # headers included by this code trigger the warning we disable it here (this
43
+ # is about version_info.h included from nysqlx/common_constants.h)
44
+ #
45
+ # [1] https://stackoverflow.com/questions/48538707/include-search-paths-from-included-header-varies-for-different-compilers
46
+
47
+ set_compiler_flag(-Wno-microsoft-include )
48
+
49
+ endif ()
50
+
51
+
32
52
add_library (common STATIC
33
53
session.cc result.cc collection.cc value .cc
34
54
${HEADERS}
35
55
)
36
56
37
57
target_link_libraries (common cdk)
38
58
39
- #TODO: Remove -Wno-delete-non-abstract-non-virtual-dtor when bumping ABI and
40
- # adding virtual destructor for DbDoc, Value and Column_detail
41
- if (CLANG)
42
- target_compile_options (common PRIVATE
43
- -Wno-delete-non-abstract -non-virtual-dtor
44
- )
45
- endif ()
46
59
47
60
#
48
61
# Note: generated version_info.h is placed in the build location
Original file line number Diff line number Diff line change 31
31
#ifndef MYSQL_COMMON_CONSTANTS_H
32
32
#define MYSQL_COMMON_CONSTANTS_H
33
33
34
- #include < version_info.h>
34
+ #include " version_info.h"
35
35
36
36
#define DEFAULT_MYSQL_PORT 3306
37
37
#define DEFAULT_MYSQLX_PORT 33060
You can’t perform that action at this time.
0 commit comments