database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

- Back off CMake version requirements.

Browse Source 
- Fix plugin extension on OSX (it is .so, not .dylib)
- add SKIP_TESTS to skip compiling test
This commit is contained in:
Vladislav Vaintroub
2016-03-15 09:01:02 +01:00
parent 91ad315e9a
commit f68b89bc46
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -11,12 +11,8 @@ SET(CPACK_PACKAGE_VERSION_MINOR 1)
SET(CPACK_PACKAGE_VERSION_PATCH 0) SET(CPACK_PACKAGE_VERSION_PATCH 0)
SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
#Minimum required version is Cmake 2.8.8, since we need to build object libraries CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
IF(WIN32)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
ELSE()
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
ENDIF()
IF(COMMAND CMAKE_POLICY) IF(COMMAND CMAKE_POLICY)
SET(OLD_POLICIES CMP0026 CMP0042 CMP0045) SET(OLD_POLICIES CMP0026 CMP0042 CMP0045)
SET(NEW_POLICIES CMP0003 CMP0022 CMP0023) SET(NEW_POLICIES CMP0003 CMP0022 CMP0023)

2
include/ma_global.h
View File

@@ -1066,8 +1066,6 @@ do { doubleget_union _tmp; \
#ifdef _WIN32 #ifdef _WIN32
#define SO_EXT ".dll" #define SO_EXT ".dll"
#elif defined(__APPLE__)
#define SO_EXT ".dylib"
#else #else
#define SO_EXT ".so" #define SO_EXT ".so"
#endif #endif

17
libmariadb/CMakeLists.txt
View File

@@ -319,10 +319,15 @@ CREATE_EXPORT_FILE(mariadbclient
"${MARIADB_LIB_SYMBOLS}") "${MARIADB_LIB_SYMBOLS}")
# CREATE OBJECT LIBRARY IF(CMAKE_VERSION VERSION_GREATER 2.8.7)
ADD_LIBRARY(mariadb_obj OBJECT ${LIBMARIADB_SOURCES}) # CREATE OBJECT LIBRARY
IF(UNIX) ADD_LIBRARY(mariadb_obj OBJECT ${LIBMARIADB_SOURCES})
SET_TARGET_PROPERTIES(mariadb_obj PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}") IF(UNIX)
SET_TARGET_PROPERTIES(mariadb_obj PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
ENDIF()
SET (MARIADB_OBJECTS $<TARGET_OBJECTS:mariadb_obj>)
ELSE()
SET (MARIADB_OBJECTS ${LIBMARIADB_SOURCES})
ENDIF() ENDIF()
# Xcode doesn't support targets that have only object files, # Xcode doesn't support targets that have only object files,
@@ -345,9 +350,9 @@ IF(WIN32)
"FILE_DESCRIPTION:Static lib for client/server communication") "FILE_DESCRIPTION:Static lib for client/server communication")
ENDIF() ENDIF()
ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} $<TARGET_OBJECTS:mariadb_obj> ${EMPTY_FILE} mariadbclient.def) ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def)
TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} $<TARGET_OBJECTS:mariadb_obj> ${EMPTY_FILE} mariadbclient.def) ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def)
TARGET_LINK_LIBRARIES(libmariadb ${SYSTEM_LIBS}) TARGET_LINK_LIBRARIES(libmariadb ${SYSTEM_LIBS})
IF(UNIX) IF(UNIX)
SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}") SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")

4
unittest/libmariadb/CMakeLists.txt
View File

@@ -13,6 +13,10 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
IF(SKIP_TESTS)
RETURN()
ENDIF()
ENABLE_TESTING() ENABLE_TESTING()