Permalink
Browse files

Update to support cmake 2.8+

  • Loading branch information...
1 parent b30c82b commit a5fe5f25725b38544e31f8dbfbd820b0d940e8e5 @drahosp drahosp committed Nov 20, 2011
Showing with 22 additions and 6 deletions.
  1. +4 −0 CMakeLists.txt
  2. +7 −0 CMakePlatformTests.txt
  3. +4 −0 dist.info
  4. +4 −3 extlib/yassl/include/config.h
  5. +1 −0 include/my_config.h.in
  6. +2 −1 libmysql/CMakeLists.txt
  7. +0 −2 libmysql/libmysql.def
View
@@ -281,6 +281,10 @@ INCLUDE(${CMAKE_SOURCE_DIR}/CMakePlatformTests.txt)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/my_config.h.in
${CMAKE_CURRENT_BINARY_DIR}/include/my_config.h)
+IF(HAVE_SSIZE_T)
+ ADD_DEFINITIONS(-DHAVE_SSIZE_T)
+ENDIF()
+
ADD_SUBDIRECTORY(vio)
ADD_SUBDIRECTORY(extlib/dbug)
ADD_SUBDIRECTORY(strings)
View
@@ -232,12 +232,19 @@ CHECK_TYPE_SIZE(uint32 SIZEOF_UINT32)
CHECK_TYPE_SIZE(u_int32_t SIZEOF_UINT_32_T)
CHECK_TYPE_SIZE(int64 SIZEOF_INT64)
CHECK_TYPE_SIZE(uint64 SIZEOF_UINT64)
+
IF(HAVE_SYS_SOCKET_H)
SET(CMAKE_EXTRA_INCLUDE_FILES sys/socket.h)
ENDIF(HAVE_SYS_SOCKET_H)
CHECK_TYPE_SIZE(socklen_t SIZEOF_SOCKLEN_T)
SET(CMAKE_EXTRA_INCLUDE_FILES)
+IF(HAVE_SYS_TYPES_H)
+ SET(CMAKE_EXTA_INCLUDE_FILES sys/types.h)
+ENDIF(HAVE_SYS_TYPES_H)
+CHECK_TYPE_SIZE(ssize_t HAVE_SSIZE_T )
+SET(CMAKE_EXTRA_INCLUDE_FILES)
+
#
# Code tests
#
View
@@ -8,3 +8,7 @@ author = "MySQL"
license = "GPL"
url = "http://www.mysql.com"
maintainer = "Peter Drahoš"
+
+depends = {
+ "zlib >= 1.2",
+}
@@ -17,7 +17,7 @@
/* #undef HAVE_NETINET_IN_H */
/* #undef HAVE_PATHS_H */
/* #undef HAVE_PWD_H */
-/* #undef HAVE_SCHED_H */
+#define HAVE_SCHED_H 1
/* #undef HAVE_SELECT_H */
#define HAVE_STDDEF_H 1
#define HAVE_STDLIB_H 1
@@ -152,6 +152,7 @@
/* #undef HAVE_THR_YIELD */
/* #undef HAVE_VASPRINTF */
#define HAVE_VSNPRINTF 1
+#define HAVE_SSIZE_T 1
/* Symbols we may use */
/* #undef HAVE_SYS_ERRLIST */
@@ -288,8 +289,8 @@
#define STACK_DIRECTION -1
-#define SHAREDIR "c:/Work/Repository/_install/share/mysql"
+#define SHAREDIR "C:/Work/LuaDist/Win/bin/../tmp/libmysql-6.0.2-Windows-x86/share/mysql"
#define THREAD 1
#define THREAD_SAFE_CLIENT 1
-#define DEFAULT_CHARSET_HOME "c:/Work/Repository/_install"
+#define DEFAULT_CHARSET_HOME "C:/Work/LuaDist/Win/bin/../tmp/libmysql-6.0.2-Windows-x86"
View
@@ -152,6 +152,7 @@
#cmakedefine HAVE_THR_YIELD 1
#cmakedefine HAVE_VASPRINTF 1
#cmakedefine HAVE_VSNPRINTF 1
+#cmakedefine HAVE_SSIZE_T 1
/* Symbols we may use */
#cmakedefine HAVE_SYS_ERRLIST 1
View
@@ -94,7 +94,8 @@ SET(CLIENT_SOURCES client.c errmsg.c get_password.c libmysql.c
# ENDIF(SOCKET_LIBRARY)
# TARGET_LINK_LIBRARIES(mysqlclient ${ZLIB_LIBRARIES})
-ADD_LIBRARY(mysql SHARED ${CLIENT_SOURCES} libmysql.def)
+#ADD_LIBRARY(mysql SHARED ${CLIENT_SOURCES} libmysql.def)
+ADD_LIBRARY(mysql SHARED ${CLIENT_SOURCES})
IF(WIN32 AND (CMAKE_GENERATOR MATCHES "MSYS" OR CMAKE_GENERATOR MATCHES "MinGW"))
TARGET_LINK_LIBRARIES(mysql ${CMAKE_THREAD_LIBS_INIT} ws2_32)
ELSE(WIN32 AND (CMAKE_GENERATOR MATCHES "MSYS" OR CMAKE_GENERATOR MATCHES "MinGW"))
View
@@ -1,5 +1,3 @@
-LIBRARY LIBMYSQL
-VERSION 6.0
EXPORTS
mysql_get_parameters
mysql_thread_end

0 comments on commit a5fe5f2

Please sign in to comment.