diff options
Diffstat (limited to 'databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt')
| -rw-r--r-- | databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt index fe9395bfd63c..9e643a62c1f6 100644 --- a/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt +++ b/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2019-03-22 10:07:57 UTC +--- libmysql/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC +++ libmysql/CMakeLists.txt -@@ -231,11 +231,11 @@ IF(WIN32) +@@ -262,11 +262,11 @@ IF(WIN32) ENDIF() # LDAP authentication SASL client plugin @@ -10,22 +10,23 @@ +# ADD_SUBDIRECTORY(authentication_ldap) # Merge several convenience libraries into one big mysqlclient --MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development) -+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development SKIP_INSTALL) +-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) ++MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) + TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK}) # Visual Studio users need debug static library for debug projects - IF(MSVC) -@@ -284,7 +284,8 @@ IF(NOT DISABLE_SHARED) +@@ -312,8 +312,9 @@ IF(NOT DISABLE_SHARED) # and link them together into shared library. - MERGE_LIBRARIES_SHARED(libmysql ${LIBS} + MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} - COMPONENT SharedLibraries) + COMPONENT SharedLibraries SKIP_INSTALL) -+ IF(FALSE) + TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK}) ++ IF (FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -328,6 +329,7 @@ IF(NOT DISABLE_SHARED) +@@ -357,6 +358,7 @@ IF(NOT DISABLE_SHARED) SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) |