summaryrefslogtreecommitdiff
path: root/storage/archive
diff options
context:
space:
mode:
authorjbruehe/mysqldev@mysql.com/production.mysql.com <>2007-08-16 18:21:47 +0200
committerjbruehe/mysqldev@mysql.com/production.mysql.com <>2007-08-16 18:21:47 +0200
commit2d4efab3661f12e85b111c97a524b4d5e5b1b592 (patch)
tree9a62f903d57f431cf953e28060ff94f1b7cfc663 /storage/archive
parentf07738caac5497de8c896670e9ea53dc5c1e5fbe (diff)
parent0e5e36421815d2c2bc67942362bebe3a2fba6b76 (diff)
downloadmariadb-git-2d4efab3661f12e85b111c97a524b4d5e5b1b592.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/data0/mysqldev/my/mysql-5.1-30367
Diffstat (limited to 'storage/archive')
-rw-r--r--storage/archive/CMakeLists.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/storage/archive/CMakeLists.txt b/storage/archive/CMakeLists.txt
index 09227a6cc2d..9a1cfe081b6 100644
--- a/storage/archive/CMakeLists.txt
+++ b/storage/archive/CMakeLists.txt
@@ -20,5 +20,9 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
${CMAKE_SOURCE_DIR}/sql
${CMAKE_SOURCE_DIR}/regex
${CMAKE_SOURCE_DIR}/extra/yassl/include)
-ADD_LIBRARY(archive azio.c ha_archive.cc ha_archive.h)
-TARGET_LINK_LIBRARIES(archive zlib mysys dbug strings)
+
+SET(ARCHIVE_SOURCES azio.c ha_archive.cc ha_archive.h)
+
+IF(NOT SOURCE_SUBLIBS)
+ ADD_LIBRARY(archive ${ARCHIVE_SOURCES})
+ENDIF(NOT SOURCE_SUBLIBS)