~ubuntu-branches/ubuntu/raring/mysql-5.5/raring-proposed

« back to all changes in this revision

Viewing changes to libmysql/CMakeLists.txt

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-02-14 23:59:22 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120214235922-cux5uek1e5l0hje9
Tags: 5.5.20-0ubuntu1
* New upstream release.
* d/mysql-server-5.5.mysql.upstart: Fix stop on to make sure mysql is
  fully stopped before shutdown commences. (LP: #688541) Also simplify
  start on as it is redundant.
* d/control: Depend on upstart version which has apparmor profile load
  script to prevent failure on upgrade from lucid to precise.
  (LP: #907465)
* d/apparmor-profile: need to allow /run since that is the true path
  of /var/run files. (LP: #917542)
* d/control: mysql-server-5.5 has files in it that used to be owned
  by libmysqlclient-dev, so it must break/replace it. (LP: #912487)
* d/rules, d/control: 5.5.20 Fixes segfault on tests with gcc 4.6,
  change compiler back to system default.
* d/rules: Turn off embedded libedit/readline.(Closes: #659566)

Show diffs side-by-side

added added

removed removed

Lines of Context:
134
134
 
135
135
)
136
136
 
137
 
IF(WIN32)
138
 
  ADD_SUBDIRECTORY(authentication_win)
139
 
  SET(WITH_AUTHENTICATION_WIN 1)
140
 
  ADD_DEFINITIONS(-DAUTHENTICATION_WIN)
141
 
ENDIF(WIN32)
142
 
 
143
137
SET(CLIENT_SOURCES
144
138
  get_password.c 
145
139
  libmysql.c
157
151
 
158
152
SET(LIBS clientlib dbug strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL})
159
153
 
160
 
IF(WITH_AUTHENTICATION_WIN)
 
154
#
 
155
# On Windows platform client library includes the client-side 
 
156
# Windows Native Authentication plugin.
 
157
#
 
158
IF(WIN32)
 
159
  ADD_DEFINITIONS(-DAUTHENTICATION_WIN)
 
160
  ADD_SUBDIRECTORY(authentication_win)
161
161
  LIST(APPEND LIBS auth_win_client)
162
 
ENDIF(WITH_AUTHENTICATION_WIN)
 
162
ENDIF()
163
163
 
164
164
# Merge several convenience libraries into one big mysqlclient
165
165
# and link them together into shared library.