Skip to content

Commit 2f1ea3e

Browse files
committed
Merge branch 'api-cleanup' into wl10787-drop-cleanup
# Conflicts: # devapi/session.cc # devapi/table_crud.cc # devapi/tests/crud-t.cc # include/mysql_devapi.h # xapi/tests/test.h
2 parents 69673b6 + d6bbd9e commit 2f1ea3e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+11716
-6288
lines changed

CMakeLists.txt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,14 @@ else()
204204
add_definitions(-DCONCPP_BUILD_SHARED)
205205
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
206206

207+
# Hide all symbols that are not explicitly exported.
207208
# Note: setting target property CXX_VISIBILITY did not work for
208209
# object libraries that we use to build the connector.
209210

210-
if(CMAKE_COMPILER_IS_GNUCXX)
211-
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
212-
add_compile_options(-fvisibility-ms-compat)
213-
elseif()
214-
add_compile_options(-fvisibility=hidden)
215-
endif()
211+
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
212+
add_compile_options(-fvisibility-ms-compat)
213+
elseif(CMAKE_COMPILER_IS_GNUCXX)
214+
add_compile_options(-fvisibility=hidden)
216215
endif()
217216

218217
endif()
@@ -518,6 +517,8 @@ SET_INTERFACE_OPTIONS(try devapi)
518517
# TODO: Do it also for the shared library
519518
#
520519

520+
if(NOT WIN32)
521+
521522
find_program(LDD ldd)
522523
if(NOT LDD)
523524
find_program(LDD otool)
@@ -533,6 +534,8 @@ if(LDD)
533534
)
534535
endif()
535536

537+
endif()
538+
536539
#
537540
# Linking test
538541
#
@@ -591,11 +594,11 @@ if(NOT CMAKE_INSTALL_PREFIX)
591594
else()
592595
set(install_prefix "C:/Program Files (x86)")
593596
endif()
594-
set(CMAKE_INSTALL_PREFIX "${install_prefix}/MySQL/MySQL Connector C++ 2.0")
597+
set(CMAKE_INSTALL_PREFIX "${install_prefix}/MySQL/MySQL Connector C++ ${CONCPP_PACKAGE_BASE_VERSION}")
595598

596599
else()
597600

598-
set(CMAKE_INSTALL_PREFIX "/usr/local/mysql/connector-c++-2.0")
601+
set(CMAKE_INSTALL_PREFIX "/usr/local/mysql/connector-c++-${CONCPP_PACKAGE_BASE_VERSION}")
599602

600603
endif()
601604

README.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MySQL Connector/C++ 2.0
1+
MySQL Connector/C++ 8.0
22

33
This is a release of MySQL Connector/C++, Oracle's
44
dual-license C++ API for connecting client applications
@@ -46,6 +46,9 @@ DOCUMENTATION LOCATION
4646
You can find the documentation on the MySQL website at
4747
<http://dev.mysql.com/doc/dev/connector-cpp/>
4848

49+
For the new features/bugfix history, see release notes at
50+
<https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-5.html>.
51+
Note that the initial releases used major version 2.0.
4952

5053
CONTACT
5154
=======

cdk/cmake/headers.cmake

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,29 @@ SET(headers_dir "${headers_dir}/headers")
5959
#MESSAGE("headers.cmake: ${headers_dir}")
6060

6161

62+
#
63+
# Check if given list of headers includes all headers that can be found in
64+
# the current directory.
65+
#
66+
67+
function(check_headers)
68+
69+
file(GLOB all_headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
70+
71+
foreach(header IN LISTS ARGV)
72+
#message("- checking header: ${header}\n")
73+
list(REMOVE_ITEM all_headers ${header})
74+
endforeach()
75+
76+
list(LENGTH all_headers remains)
77+
78+
if(remains GREATER 0)
79+
message(WARNING "Extra headers found in ${CMAKE_CURRENT_SOURCE_DIR}: ${all_headers}")
80+
endif()
81+
82+
endfunction()
83+
84+
6285
#
6386
# Set-up header declarations with given folder as a base location for all
6487
# public headers.

0 commit comments

Comments
 (0)