Changeset View
Changeset View
Standalone View
Standalone View
databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt
| --- libmysql/CMakeLists.txt.orig 2013-07-10 18:17:29.000000000 +0200 | --- libmysql/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC | ||||
| +++ libmysql/CMakeLists.txt 2013-08-12 08:59:49.000000000 +0200 | +++ libmysql/CMakeLists.txt | ||||
| @@ -173,7 +173,7 @@ | @@ -180,7 +180,7 @@ IF(WIN32) | ||||
| ENDIF() | ENDIF() | ||||
| # Merge several convenience libraries into one big mysqlclient | # Merge several convenience libraries into one big mysqlclient | ||||
| -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) | ||||
| @@ -200,19 +200,22 @@ | @@ -208,19 +208,22 @@ IF(UNIX) | ||||
| ENDMACRO() | ENDMACRO() | ||||
| ENDIF() | ENDIF() | ||||
| +IF(FALSE) | +IF(FALSE) | ||||
| IF(UNIX) | IF(UNIX) | ||||
| GET_TARGET_NAME(mysqlclient lib_name) | GET_TARGET_NAME(mysqlclient lib_name) | ||||
| INSTALL_SYMLINK(mysqlclient | INSTALL_SYMLINK(mysqlclient | ||||
| ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a | ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a | ||||
| ${INSTALL_LIBDIR} Development) | ${INSTALL_LIBDIR} Development) | ||||
| ENDIF() | ENDIF() | ||||
| +ENDIF() | +ENDIF() | ||||
| IF(NOT DISABLE_SHARED) | IF(NOT DISABLE_SHARED) | ||||
| # 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(libmysql SHARED ${LIBS} | MERGE_LIBRARIES(libmysql SHARED ${LIBS} | ||||
| EXPORTS ${CLIENT_API_FUNCTIONS} | EXPORTS ${CLIENT_API_FUNCTIONS} | ||||
| - 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) | ||||
| @@ -271,4 +274,5 @@ | @@ -289,4 +292,5 @@ IF(NOT DISABLE_SHARED) | ||||
| ${INSTALL_LIBDIR} SharedLibraries) | ${INSTALL_LIBDIR} SharedLibraries) | ||||
| ENDFOREACH() | ENDFOREACH() | ||||
| ENDIF() | ENDIF() | ||||
| + ENDIF() | + ENDIF() | ||||
| ENDIF() | ENDIF() | ||||