diff options
author | unknown <Reggie@xgeek.> | 2006-03-15 10:22:12 -0600 |
---|---|---|
committer | unknown <Reggie@xgeek.> | 2006-03-15 10:22:12 -0600 |
commit | 66f7f0869bd84bd9e0eb4686ba63e630e2a1c017 (patch) | |
tree | 7ccce28f648a761a9c8ef0148400d0864016858c /extra | |
parent | d38785aa6a77afd942aebbff64e234ffbcd7da25 (diff) | |
download | mariadb-git-66f7f0869bd84bd9e0eb4686ba63e630e2a1c017.tar.gz |
Moved cmake scripts into the proper directories
sql/cmakelists.txt:
Rename: sql/sql -> sql/cmakelists.txt
zlib/cmakelists.txt:
Rename: win/cmakefiles/zlib -> zlib/cmakelists.txt
vio/cmakelists.txt:
Rename: win/cmakefiles/vio -> vio/cmakelists.txt
regex/cmakelists.txt:
Rename: win/cmakefiles/regex -> regex/cmakelists.txt
mysys/cmakelists.txt:
Rename: win/cmakefiles/mysys -> mysys/cmakelists.txt
cmakelists.txt:
Rename: win/cmakefiles/base -> cmakelists.txt
dbug/cmakelists.txt:
Rename: win/cmakefiles/dbug -> dbug/cmakelists.txt
strings/cmakelists.txt:
Rename: win/cmakefiles/strings -> strings/cmakelists.txt
libmysql/cmakelists.txt:
Rename: win/cmakefiles/libmysql -> libmysql/cmakelists.txt
client/cmakelists.txt:
Rename: win/cmakefiles/client -> client/cmakelists.txt
extra/cmakelists.txt:
Rename: win/cmakefiles/extra -> extra/cmakelists.txt
tests/cmakelists.txt:
Rename: win/cmakefiles/tests -> tests/cmakelists.txt
server-tools/instance-manager/cmakelists.txt:
Rename: win/cmakefiles/im -> server-tools/instance-manager/cmakelists.txt
storage/heap/cmakelists.txt:
Rename: win/cmakefiles/heap -> storage/heap/cmakelists.txt
storage/myisam/cmakelists.txt:
Rename: win/cmakefiles/myisam -> storage/myisam/cmakelists.txt
storage/myisammrg/cmakelists.txt:
Rename: win/cmakefiles/myisammrg -> storage/myisammrg/cmakelists.txt
storage/bdb/cmakelists.txt:
Rename: win/cmakefiles/bdb -> storage/bdb/cmakelists.txt
storage/innobase/cmakelists.txt:
Rename: win/cmakefiles/innobase -> storage/innobase/cmakelists.txt
extra/yassl/cmakelists.txt:
Rename: win/cmakefiles/yassl -> extra/yassl/cmakelists.txt
extra/yassl/taocrypt/cmakelists.txt:
Rename: win/cmakefiles/taocrypt -> extra/yassl/taocrypt/cmakelists.txt
BitKeeper/deleted/.del-deploy.bat~f6b42340:
Delete: win/cmakefiles/deploy.bat
Diffstat (limited to 'extra')
-rw-r--r-- | extra/cmakelists.txt | 29 | ||||
-rw-r--r-- | extra/yassl/cmakelists.txt | 6 | ||||
-rw-r--r-- | extra/yassl/taocrypt/cmakelists.txt | 13 |
3 files changed, 48 insertions, 0 deletions
diff --git a/extra/cmakelists.txt b/extra/cmakelists.txt new file mode 100644 index 00000000000..d31779fca63 --- /dev/null +++ b/extra/cmakelists.txt @@ -0,0 +1,29 @@ +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) + +ADD_EXECUTABLE(comp_err comp_err.c) +TARGET_LINK_LIBRARIES(comp_err dbug mysys strings wsock32) + +GET_TARGET_PROPERTY(COMP_ERR_EXE comp_err LOCATION) + +ADD_CUSTOM_TARGET(GenError + ${COMP_ERR_EXE} --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets + --out-dir=${PROJECT_SOURCE_DIR}/sql/share/ + --header_file=${PROJECT_SOURCE_DIR}/include/mysqld_error.h + --name_file=${PROJECT_SOURCE_DIR}/include/mysqld_ername.h + --state_file=${PROJECT_SOURCE_DIR}/include/sql_state.h + --in_file=${PROJECT_SOURCE_DIR}/sql/share/errmsg.txt + DEPENDS comp_err ${PROJECT_SOURCE_DIR}/sql/share/errmsg.txt) + + + +ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) +TARGET_LINK_LIBRARIES(my_print_defaults strings mysys dbug taocrypt odbc32 odbccp32 wsock32) + +ADD_EXECUTABLE(perror perror.c) +TARGET_LINK_LIBRARIES(perror strings mysys dbug wsock32) + +ADD_EXECUTABLE(replace replace.c) +TARGET_LINK_LIBRARIES(replace strings mysys dbug wsock32) diff --git a/extra/yassl/cmakelists.txt b/extra/yassl/cmakelists.txt new file mode 100644 index 00000000000..cafa3011e94 --- /dev/null +++ b/extra/yassl/cmakelists.txt @@ -0,0 +1,6 @@ +ADD_DEFINITIONS("-DWIN32 -D_LIB") + +INCLUDE_DIRECTORIES(include taocrypt/include 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 new file mode 100644 index 00000000000..6f4d0395ff6 --- /dev/null +++ b/extra/yassl/taocrypt/cmakelists.txt @@ -0,0 +1,13 @@ +INCLUDE_DIRECTORIES(../mySTL include) + +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /GX-") +SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GX-") + +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 + src/md5.cpp src/misc.cpp src/random.cpp src/ripemd.cpp src/rsa.cpp src/sha.cpp + include/aes.hpp include/algebra.hpp include/arc4.hpp include/asn.hpp include/block.hpp + include/coding.hpp include/des.hpp include/dh.hpp include/dsa.hpp include/dsa.hpp + 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) |