90 lines
4.0 KiB
Diff
90 lines
4.0 KiB
Diff
From 9af2954796a6f705b0a4f5ce415ce7bdfa3ab5ce Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sat, 17 Sep 2016 16:41:12 +0200
|
|
Subject: [PATCH 1/3] Fix libnames for mingw-w64
|
|
|
|
---
|
|
libmariadb/CMakeLists.txt | 39 ++++++++++++++++++++-------------------
|
|
1 file changed, 20 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
|
|
index f07dc02..ea58fd4 100644
|
|
--- a/libmariadb/CMakeLists.txt
|
|
+++ b/libmariadb/CMakeLists.txt
|
|
@@ -362,7 +362,7 @@ SET(LIBMARIADB_SOURCES ${LIBMARIADB_SOURCES} ${ZLIB_SOURCES})
|
|
ENDIF()
|
|
|
|
IF(WIN32)
|
|
- SET_VERSION_INFO("TARGET:libmariadb"
|
|
+ SET_VERSION_INFO("TARGET:mariadb"
|
|
"FILE_TYPE:VFT_DLL"
|
|
"SOURCE_FILE:libmariadb/libmariadb.c"
|
|
"ORIGINAL_FILE_NAME:libmariadb.dll"
|
|
@@ -390,23 +390,24 @@ ENDIF()
|
|
ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} $<TARGET_OBJECTS:mariadb_obj> ${EMPTY_FILE} ${EXPORT_LINK})
|
|
TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
|
|
|
|
-ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} $<TARGET_OBJECTS:mariadb_obj> ${EMPTY_FILE} ${EXPORT_LINK})
|
|
-TARGET_LINK_LIBRARIES(libmariadb ${SYSTEM_LIBS})
|
|
+ADD_LIBRARY(mariadb SHARED ${libmariadb_RC} ${LIBMARIADB_SOURCES} ${EMPTY_FILE})
|
|
+TARGET_LINK_LIBRARIES(mariadb ${SYSTEM_LIBS})
|
|
IF(UNIX)
|
|
- SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
|
|
+ SET_TARGET_PROPERTIES(mariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
|
|
ENDIF()
|
|
-SIGN_TARGET(libmariadb)
|
|
+SIGN_TARGET(mariadb)
|
|
|
|
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
- TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined")
|
|
- TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${EXPORT_FILE}")
|
|
+ TARGET_LINK_LIBRARIES (mariadb "-Wl,--no-undefined")
|
|
+ TARGET_LINK_LIBRARIES (mariadb "-Wl,--version-script=${EXPORT_FILE}")
|
|
TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--no-undefined")
|
|
TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--version-script=${EXPORT_FILE}")
|
|
ENDIF()
|
|
|
|
-SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")
|
|
+# for consistency with previous version
|
|
+#SET_TARGET_PROPERTIES(mariadb PROPERTIES PREFIX "")
|
|
|
|
-SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION
|
|
+SET_TARGET_PROPERTIES(mariadb PROPERTIES VERSION
|
|
${CPACK_PACKAGE_VERSION_MAJOR}
|
|
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
|
|
|
|
@@ -419,20 +420,20 @@ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/symlink.cmake)
|
|
# There are still several projects which don't make use
|
|
# of the config program. To make sure these programs can
|
|
# use mariadb client library we provide libmysql symlinks
|
|
-IF(NOT WIN32 AND WITH_MYSQLCOMPAT)
|
|
- SET(INSTALL_PATH ${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
|
|
- create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_PATH})
|
|
- create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_PATH})
|
|
- create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_PATH})
|
|
- create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_PATH})
|
|
+IF(WITH_MYSQLCOMPAT)
|
|
+ SET(INSTALL_PATH ${LIB_INSTALL_DIR})
|
|
+ create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} mariadb ${BIN_INSTALL_DIR})
|
|
+ create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} mariadb ${BIN_INSTALL_DIR})
|
|
+ create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${LIB_INSTALL_DIR})
|
|
+ create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${LIB_INSTALL_DIR})
|
|
ENDIF()
|
|
|
|
|
|
INSTALL(TARGETS
|
|
- libmariadb mariadbclient
|
|
- RUNTIME DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}"
|
|
- LIBRARY DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}"
|
|
- ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}")
|
|
+ mariadb mariadbclient
|
|
+ RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
|
|
+ LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
|
|
+ ARCHIVE DESTINATION "${LIB_INSTALL_DIR}")
|
|
|
|
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
|
|
DESTINATION ${INCLUDE_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
|
|
--
|
|
2.9.3
|
|
|