diff options
| author | unknown <jbruehe/mysqldev@mysql.com/production.mysql.com> | 2007-08-16 18:21:47 +0200 |
|---|---|---|
| committer | unknown <jbruehe/mysqldev@mysql.com/production.mysql.com> | 2007-08-16 18:21:47 +0200 |
| commit | 6b10f518b9eb2ca8dd5c0f2ec0c67a6fde730729 (patch) | |
| tree | 9a62f903d57f431cf953e28060ff94f1b7cfc663 /vio | |
| parent | c492a2392e283b6448cac2b3813b5a8b3906df93 (diff) | |
| parent | 1c47af79da738cbba009d2801da0cfb8ee45a3da (diff) | |
| download | mariadb-git-6b10f518b9eb2ca8dd5c0f2ec0c67a6fde730729.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/data0/mysqldev/my/mysql-5.1-30367
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
sql/log_event.cc:
Manual merge, later version of the fix takes precedence.
Diffstat (limited to 'vio')
| -rwxr-xr-x | vio/CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vio/CMakeLists.txt b/vio/CMakeLists.txt index e4940d54da8..83cd6f65e6d 100755 --- a/vio/CMakeLists.txt +++ b/vio/CMakeLists.txt @@ -18,4 +18,10 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUT ADD_DEFINITIONS(-DUSE_SYMDIR) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/extra/yassl/include) -ADD_LIBRARY(vio vio.c viosocket.c viossl.c viosslfactories.c) + +SET(VIO_SOURCES vio.c viosocket.c viossl.c viosslfactories.c) + +IF(NOT SOURCE_SUBLIBS) + ADD_LIBRARY(vio ${VIO_SOURCES}) +ENDIF(NOT SOURCE_SUBLIBS) + |