diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-07-18 15:53:10 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-07-18 15:53:10 +0200 |
| commit | 0114d8c0824091f455382ffd6b93b5d5307dc00c (patch) | |
| tree | 0044375f285f5d70435da38b27ecb2e290d20aaa | |
| parent | 9653787d3fab5771f99ecaf8fdbf1dae90a0deae (diff) | |
| download | mariadb-git-0114d8c0824091f455382ffd6b93b5d5307dc00c.tar.gz | |
CMakeLists.txt, configure.js:
Allow to set mysqld exe suffix
sql/CMakeLists.txt:
Allow to set mysqld exe suffix
win/configure.js:
Allow to set mysqld exe suffix
| -rw-r--r-- | sql/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | win/configure.js | 1 |
2 files changed, 12 insertions, 9 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 85c2013d8e7..a8aa7d70586 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -15,9 +15,10 @@ INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake") SET(CMAKE_CXX_FLAGS_DEBUG - "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR") + "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi") SET(CMAKE_C_FLAGS_DEBUG - "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR") + "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi") +SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /MAP /MAPINFO:EXPORTS") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/extra/yassl/include @@ -40,7 +41,8 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc ADD_DEFINITIONS(-DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN) -ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc +ADD_EXECUTABLE(mysqld${MYSQLD_EXE_SUFFIX} + ../sql-common/client.c derror.cc des_key_file.cc discover.cc ../libmysql/errmsg.c field.cc field_conv.cc filesort.cc gstream.cc ha_partition.cc @@ -81,7 +83,8 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc ${PROJECT_SOURCE_DIR}/include/mysql_version.h ${PROJECT_SOURCE_DIR}/sql/sql_builtin.cc ${PROJECT_SOURCE_DIR}/sql/lex_hash.h) -TARGET_LINK_LIBRARIES(mysqld heap myisam myisammrg mysys yassl zlib dbug yassl +TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} + heap myisam myisammrg mysys yassl zlib dbug yassl taocrypt strings vio regex wsock32 ws2_32) IF(EMBED_MANIFESTS) @@ -97,16 +100,16 @@ IF(WITH_CSV_STORAGE_ENGINE) TARGET_LINK_LIBRARIES(mysqld csv) ENDIF(WITH_CSV_STORAGE_ENGINE) IF(WITH_EXAMPLE_STORAGE_ENGINE) - TARGET_LINK_LIBRARIES(mysqld example) + TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} example) ENDIF(WITH_EXAMPLE_STORAGE_ENGINE) IF(WITH_FEDERATED_STORAGE_ENGINE) TARGET_LINK_LIBRARIES(mysqld federated) ENDIF(WITH_FEDERATED_STORAGE_ENGINE) IF(WITH_INNOBASE_STORAGE_ENGINE) - TARGET_LINK_LIBRARIES(mysqld innobase) + TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} innobase) ENDIF(WITH_INNOBASE_STORAGE_ENGINE) -ADD_DEPENDENCIES(mysqld GenError) +ADD_DEPENDENCIES(mysqld${MYSQLD_EXE_SUFFIX} GenError) # Sql Parser custom command ADD_CUSTOM_COMMAND( @@ -138,8 +141,7 @@ ADD_CUSTOM_COMMAND( COMMAND ${GEN_LEX_HASH_EXE} ARGS > lex_hash.h DEPENDS ${GEN_LEX_HASH_EXE} ) - -ADD_DEPENDENCIES(mysqld gen_lex_hash) +ADD_DEPENDENCIES(mysqld${MYSQLD_EXE_SUFFIX} gen_lex_hash) ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def) ADD_DEPENDENCIES(udf_example strings) diff --git a/win/configure.js b/win/configure.js index 06c2fe56a51..2b0e2bbcc37 100644 --- a/win/configure.js +++ b/win/configure.js @@ -51,6 +51,7 @@ try configfile.WriteLine("SET (" + args.Item(i) + " TRUE)"); break; case "MYSQL_SERVER_SUFFIX": + case "MYSQLD_EXE_SUFFIX": configfile.WriteLine("SET (" + parts[0] + " \"" + parts[1] + "\")"); break; |