diff options
| author | Vladislav Vaintroub <wlad@sol> | 2009-11-24 23:15:47 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@sol> | 2009-11-24 23:15:47 +0000 |
| commit | 7377c50cb4f5b5dcb356a71787b53840d2c6ef3c (patch) | |
| tree | 7ec79f7bfee3d63a780478c577294a5b729d6143 /extra | |
| parent | 9abc7cf070fcb3d8e79ef0cb4d767d11affebb25 (diff) | |
| download | mariadb-git-7377c50cb4f5b5dcb356a71787b53840d2c6ef3c.tar.gz | |
implement convenience libraries
Diffstat (limited to 'extra')
| -rwxr-xr-x | extra/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | extra/yassl/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | extra/yassl/taocrypt/CMakeLists.txt | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index c1487149acd..bf7232e4b0a 100755 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -27,7 +27,7 @@ ${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmapi) IF(NOT CMAKE_CROSSCOMPILING) ADD_EXECUTABLE(comp_err comp_err.c) - TARGET_LINK_LIBRARIES(comp_err ${ZLIB_LIBRARY} mysys) + TARGET_LINK_LIBRARIES(comp_err mysys) ENDIF() ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt index a815a46a323..1bc75956221 100755 --- a/extra/yassl/CMakeLists.txt +++ b/extra/yassl/CMakeLists.txt @@ -29,6 +29,6 @@ ENDIF() SET(YASSL_SOURCES src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp src/handshake.cpp src/lock.cpp src/log.cpp src/socket_wrapper.cpp src/ssl.cpp src/timer.cpp src/yassl_error.cpp src/yassl_imp.cpp src/yassl_int.cpp) -USE_ABSOLUTE_FILENAMES(YASSL_SOURCES) -ADD_LIBRARY(yassl ${YASSL_SOURCES}) +ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES}) + diff --git a/extra/yassl/taocrypt/CMakeLists.txt b/extra/yassl/taocrypt/CMakeLists.txt index 58de3989b73..34ff2323390 100755 --- a/extra/yassl/taocrypt/CMakeLists.txt +++ b/extra/yassl/taocrypt/CMakeLists.txt @@ -18,9 +18,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ADD_DEFINITIONS(${SSL_DEFINES}) -IF(PREVENT_CPP_RUNTIME) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PREVENT_CPP_RUNTIME}") -ENDIF() SET(TAOCRYPT_SOURCES src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp src/asn.cpp src/coding.cpp src/des.cpp src/dh.cpp src/dsa.cpp src/file.cpp src/hash.cpp src/integer.cpp src/md2.cpp src/md4.cpp src/md5.cpp src/misc.cpp src/random.cpp src/ripemd.cpp src/rsa.cpp src/sha.cpp @@ -29,6 +26,5 @@ SET(TAOCRYPT_SOURCES src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp include/error.hpp include/file.hpp include/hash.hpp include/hmac.hpp include/integer.hpp include/md2.hpp include/md5.hpp include/misc.hpp include/modarith.hpp include/modes.hpp include/random.hpp include/ripemd.hpp include/rsa.hpp include/sha.hpp) -USE_ABSOLUTE_FILENAMES(TAOCRYPT_SOURCES) -ADD_LIBRARY(taocrypt ${TAOCRYPT_SOURCES}) +ADD_CONVENIENCE_LIBRARY(taocrypt ${TAOCRYPT_SOURCES}) |