diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-07-19 18:00:29 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-07-19 18:00:29 +0400 |
| commit | b5eac2b2cec6919a57adc5dbf6dae39ce5525eff (patch) | |
| tree | 6ba958e0b0ab253cbf6193e11f5e36bcbc694622 /extra/yassl/CMakeLists.txt | |
| parent | 917c33cfbf7feade67ae4d4d884870e8f96f822e (diff) | |
| parent | e875a1d66b83b758c34d2190ffd180bd626327ea (diff) | |
| download | mariadb-git-b5eac2b2cec6919a57adc5dbf6dae39ce5525eff.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- scripts/CMakeLists.txt
Diffstat (limited to 'extra/yassl/CMakeLists.txt')
| -rw-r--r-- | extra/yassl/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt index 82d7e5b7581..63eabb45824 100644 --- a/extra/yassl/CMakeLists.txt +++ b/extra/yassl/CMakeLists.txt @@ -28,7 +28,7 @@ ${CMAKE_CXX_FLAGS}) 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) + src/yassl_imp.cpp src/yassl_int.cpp src/template_instnt.cpp) ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES}) RESTRICT_SYMBOL_EXPORTS(yassl) |