blob: 326036c0b88d3bd056f4780e3a53768a5f19388f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
--- a/cmake/FindMySQL.cmake 2016-11-29 07:40:13.000000000 -0500
+++ b/cmake/FindMySQL.cmake 2017-02-17 13:59:18.115389096 -0500
@@ -747,7 +747,7 @@
endif()
if(NOT MYSQL_CXXFLAGS)
- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
+ if(MYSQL_CXX_LINKAGE)
_mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
set(MYSQL_CXX_LINKAGE 1)
else()
diff -aurN a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2018-02-10 21:41:13.161553751 -0500
+++ b/CMakeLists.txt 2018-02-10 21:45:20.038398824 -0500
@@ -379,10 +379,9 @@
SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
-SET(LIB_SUBDIR "lib")
-IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64|aarch64)")
- SET(LIB_SUBDIR "lib64")
-ENDIF()
+IF(NOT LIB_SUBDIR)
+ MESSAGE(ERROR "LIB_SUBDIR is not set")
+ENDIF(NOT LIB_SUBDIR)
MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
diff -aurN a/driver/CMakeLists.txt b/driver/CMakeLists.txt
--- a/driver/CMakeLists.txt 2019-06-11 13:46:37.863345781 -0400
+++ b/driver/CMakeLists.txt 2019-06-11 14:04:25.758997218 -0400
@@ -194,29 +194,3 @@
ENDWHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT})
-IF(MYSQL8)
- SET(ssl_libs_to_find
- libcrypto.*
- libssl.*
- libeay32.*
- ssleay32.*
- )
-
- SET(_SSL_PATH)
-
- IF(WIN32)
- SET(_SSL_PATH ${MYSQL_DIR}/bin/)
- ELSE(WIN32)
- SET(_SSL_PATH ${MYSQL_DIR}/lib/)
- ENDIF(WIN32)
-
- FOREACH(_lib_to_find IN LISTS ssl_libs_to_find)
- INSTALL(DIRECTORY ${_SSL_PATH} DESTINATION ${LIB_SUBDIR}
- FILES_MATCHING
- PATTERN "mecab" EXCLUDE
- PATTERN "pkgconfig" EXCLUDE
- PATTERN "plugin" EXCLUDE
- PATTERN ${_lib_to_find})
- ENDFOREACH()
-
-ENDIF(MYSQL8)
\ No newline at end of file
|
