Changeset View
Changeset View
Standalone View
Standalone View
databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt
--- libmysql/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 | --- libmysql/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 | ||||
+++ libmysql/CMakeLists.txt 2014-09-05 18:46:34.420323119 +0200 | +++ libmysql/CMakeLists.txt 2014-09-05 18:46:34.420323119 +0200 | ||||
@@ -403,7 +403,7 @@ | @@ -410,7 +410,7 @@ SET(LIBS clientlib dbug strings vio mysy | ||||
# Merge several convenience libraries into one big mysqlclient | # Merge several convenience libraries into one big mysqlclient | ||||
# and link them together into shared library. | # and link them together into shared library. | ||||
-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) | -MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) | ||||
+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) | +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) | ||||
# Visual Studio users need debug static library for debug projects | # Visual Studio users need debug static library for debug projects | ||||
IF(MSVC) | IF(MSVC) | ||||
@@ -411,6 +411,7 @@ | @@ -418,6 +418,7 @@ IF(MSVC) | ||||
INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) | INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) | ||||
ENDIF() | ENDIF() | ||||
+IF(FALSE) | +IF(FALSE) | ||||
IF(UNIX) | IF(UNIX) | ||||
MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) | MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) | ||||
SET(DOT_VERSION ".${VERSION}") | SET(DOT_VERSION ".${VERSION}") | ||||
@@ -425,11 +426,13 @@ | @@ -432,11 +433,13 @@ IF(UNIX) | ||||
ENDMACRO() | ENDMACRO() | ||||
INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) | INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) | ||||
ENDIF() | ENDIF() | ||||
+ENDIF() | +ENDIF() | ||||
IF(NOT DISABLE_SHARED) | IF(NOT DISABLE_SHARED) | ||||
MERGE_LIBRARIES(libmysql SHARED ${LIBS} | MERGE_LIBRARIES(libmysql SHARED ${LIBS} | ||||
EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA} | EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA} | ||||
- COMPONENT SharedLibraries) | - COMPONENT SharedLibraries) | ||||
+ COMPONENT SharedLibraries NOINSTALL) | + COMPONENT SharedLibraries NOINSTALL) | ||||
+IF(FALSE) | +IF(FALSE) | ||||
IF(UNIX) | IF(UNIX) | ||||
# libtool compatability | # libtool compatability | ||||
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) | IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) | ||||
@@ -477,3 +480,4 @@ | @@ -484,3 +487,4 @@ IF(NOT DISABLE_SHARED) | ||||
ENDFOREACH() | ENDFOREACH() | ||||
ENDIF() | ENDIF() | ||||
ENDIF() | ENDIF() | ||||
+ENDIF() | +ENDIF() |