Lines 1-7
Link Here
|
1 |
--- libmysql/CMakeLists.txt.orig 2018-01-23 20:34:50.742425000 +0200 |
1 |
--- libmysql/CMakeLists.txt.orig 2019-03-22 10:07:57 UTC |
2 |
+++ libmysql/CMakeLists.txt 2018-01-23 20:36:13.066280000 +0200 |
2 |
+++ libmysql/CMakeLists.txt |
3 |
@@ -235,7 +235,7 @@ |
3 |
@@ -231,11 +231,11 @@ IF(WIN32) |
4 |
ADD_SUBDIRECTORY(authentication_ldap) |
4 |
ENDIF() |
|
|
5 |
|
6 |
# LDAP authentication SASL client plugin |
7 |
-MESSAGE(STATUS "Creating LDAP authentication SASL client library.") |
8 |
-ADD_SUBDIRECTORY(authentication_ldap) |
9 |
+# MESSAGE(STATUS "Creating LDAP authentication SASL client library.") |
10 |
+# ADD_SUBDIRECTORY(authentication_ldap) |
5 |
|
11 |
|
6 |
# Merge several convenience libraries into one big mysqlclient |
12 |
# Merge several convenience libraries into one big mysqlclient |
7 |
-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development) |
13 |
-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development) |
Lines 9-15
Link Here
|
9 |
|
15 |
|
10 |
# Visual Studio users need debug static library for debug projects |
16 |
# Visual Studio users need debug static library for debug projects |
11 |
IF(MSVC) |
17 |
IF(MSVC) |
12 |
@@ -271,7 +271,8 @@ |
18 |
@@ -284,7 +284,8 @@ IF(NOT DISABLE_SHARED) |
13 |
# and link them together into shared library. |
19 |
# and link them together into shared library. |
14 |
MERGE_LIBRARIES_SHARED(libmysql ${LIBS} |
20 |
MERGE_LIBRARIES_SHARED(libmysql ${LIBS} |
15 |
EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} |
21 |
EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} |
Lines 19-29
Link Here
|
19 |
IF(UNIX) |
25 |
IF(UNIX) |
20 |
# libtool compatability |
26 |
# libtool compatability |
21 |
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) |
27 |
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) |
22 |
@@ -316,6 +317,7 @@ |
28 |
@@ -328,6 +329,7 @@ IF(NOT DISABLE_SHARED) |
|
|
29 |
SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) |
23 |
SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) |
30 |
SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) |
24 |
|
31 |
|
|
|
32 |
+ ENDIF() |
25 |
ENDIF() |
33 |
ENDIF() |
26 |
+ ENDIF() |
|
|
27 |
ENDIF() |
34 |
ENDIF() |
28 |
|
35 |
|
29 |
# |
|
|