diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-05 17:44:08 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-05 17:44:08 -0400 |
| commit | a7a605cb592c7e396542154f532d4d7a932f1de1 (patch) | |
| tree | 57bac44487313a1b228e9e46199139aa27a462aa /server-tools | |
| parent | 52f5b9dd7d53ef1b2c5504fe879a852b19c8c7a0 (diff) | |
| parent | 8f4477281eb5f110094927abe7dabd67c8525fc5 (diff) | |
| download | mariadb-git-a7a605cb592c7e396542154f532d4d7a932f1de1.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
BitKeeper/deleted/.del-CMakeLists.txt~1:
Delete: CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~2:
Delete: server-tools/instance-manager/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~3:
Delete: sql/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~4:
Delete: strings/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~5:
Delete: tests/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~6:
Delete: vio/CMakeLists.txt
BitKeeper/deleted/.del-Makefile.am~2:
Delete: win/Makefile.am
BitKeeper/deleted/.del-README~1:
Delete: win/README
BitKeeper/deleted/.del-build-vs71.bat:
Delete: win/build-vs71.bat
BitKeeper/deleted/.del-build-vs8.bat:
Delete: win/build-vs8.bat
BitKeeper/deleted/.del-configure.js:
Delete: win/configure.js
BitKeeper/deleted/.del-CMakeLists.txt~7:
Delete: client/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~8:
Delete: zlib/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~9:
Delete: dbug/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~10:
Delete: extra/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~11:
Delete: extra/yassl/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~12:
Delete: extra/yassl/taocrypt/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~13:
Delete: libmysql/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~14:
Delete: mysys/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~15:
Delete: regex/CMakeLists.txt
Diffstat (limited to 'server-tools')
| -rwxr-xr-x | server-tools/CMakeLists.txt | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/server-tools/CMakeLists.txt b/server-tools/CMakeLists.txt new file mode 100755 index 00000000000..1983d459ce2 --- /dev/null +++ b/server-tools/CMakeLists.txt @@ -0,0 +1,18 @@ +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") + +ADD_DEFINITIONS(-DMYSQL_SERVER -DMYSQL_INSTANCE_MANAGER) +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/sql + ${PROJECT_SOURCE_DIR}/extra/yassl/include) + +ADD_EXECUTABLE(mysqlmanager buffer.cc command.cc commands.cc guardian.cc instance.cc instance_map.cc + instance_options.cc listener.cc log.cc manager.cc messages.cc mysql_connection.cc + mysqlmanager.cc options.cc parse.cc parse_output.cc priv.cc protocol.cc + thread_registry.cc user_map.cc imservice.cpp windowsservice.cpp + user_management_commands.cc + ../../sql/net_serv.cc ../../sql-common/pack.c ../../sql/password.c + ../../sql/sql_state.c ../../sql-common/client.c ../../libmysql/get_password.c + ../../libmysql/errmsg.c) + +ADD_DEPENDENCIES(mysqlmanager GenError) +TARGET_LINK_LIBRARIES(mysqlmanager dbug mysys strings taocrypt vio yassl zlib wsock32) |