summaryrefslogtreecommitdiff
path: root/extra/yassl
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-09-28 09:38:26 +0200
committerunknown <msvensson@neptunus.(none)>2006-09-28 09:38:26 +0200
commit440135998dad8b76c9e698ad80023d2912a1978b (patch)
tree22117b8d1f8a617a207331efc9d4cf597aba4f79 /extra/yassl
parentffd5de297a06481c7c3bc568ae42689dac5dadb4 (diff)
parentb5de7e8e012dba2ba670916d1aa152da9a77a0c6 (diff)
downloadmariadb-git-440135998dad8b76c9e698ad80023d2912a1978b.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/work/my51-work
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
Diffstat (limited to 'extra/yassl')
-rw-r--r--extra/yassl/CMakeLists.txt2
-rw-r--r--extra/yassl/taocrypt/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt
index e5429876072..09bd2b046da 100644
--- a/extra/yassl/CMakeLists.txt
+++ b/extra/yassl/CMakeLists.txt
@@ -1,6 +1,6 @@
ADD_DEFINITIONS("-DWIN32 -D_LIB -DYASSL_PREFIX")
-INCLUDE_DIRECTORIES(include taocrypt/include mySTL)
+INCLUDE_DIRECTORIES(include taocrypt/include taocrypt/mySTL)
ADD_LIBRARY(yassl 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)
diff --git a/extra/yassl/taocrypt/CMakeLists.txt b/extra/yassl/taocrypt/CMakeLists.txt
index 0af0a242e5d..540827954d0 100644
--- a/extra/yassl/taocrypt/CMakeLists.txt
+++ b/extra/yassl/taocrypt/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES(../mySTL include)
+INCLUDE_DIRECTORIES(mySTL include)
ADD_LIBRARY(taocrypt 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