diff options
| author | iggy@amd64.(none) <> | 2007-08-03 14:43:12 -0400 |
|---|---|---|
| committer | iggy@amd64.(none) <> | 2007-08-03 14:43:12 -0400 |
| commit | 3ed9739c82e27d3bbe60e37819582b0666cb742b (patch) | |
| tree | 743ce671890386580cfb5fe72e9393a21c9f567f /libmysqld/examples | |
| parent | e8eaca54a3d391e55b9e379e08c52acc28f657fb (diff) | |
| download | mariadb-git-3ed9739c82e27d3bbe60e37819582b0666cb742b.tar.gz | |
Bug#29903 The CMake build method does not produce the embedded library.
- Changes to correct and test Windows embedded build.
Diffstat (limited to 'libmysqld/examples')
| -rw-r--r-- | libmysqld/examples/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index 59fa390399d..13956fe0a10 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -23,11 +23,11 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include # Currently does not work with DBUG, there are missing symbols reported. ADD_DEFINITIONS(-DDBUG_OFF) ADD_DEFINITIONS(-DUSE_TLS) -ADD_EXECUTABLE(test_libmysqld ../../client/completion_hash.cc +ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc ../../client/mysql.cc ../../client/readline.cc ../../client/sql_string.cc) -TARGET_LINK_LIBRARIES(test_libmysqld mysys yassl taocrypt zlib dbug regex strings wsock32) -ADD_DEPENDENCIES(test_libmysqld libmysqld) +TARGET_LINK_LIBRARIES(mysql_embedded mysys yassl taocrypt zlib dbug regex strings wsock32) +ADD_DEPENDENCIES(mysql_embedded libmysqld) ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.c) TARGET_LINK_LIBRARIES(mysqltest_embedded mysys yassl taocrypt zlib dbug regex strings wsock32) diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index ec5bbbb86e5..4a91724afee 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -19,6 +19,7 @@ client_sources = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES) tests_sources = $(mysql_client_test_embedded_SOURCES) BUILT_SOURCES = link_sources CLEANFILES = $(client_sources) $(tests_sources) $(BUILT_SOURCES) +EXTRA_DIST = CMakeLists.txt link_sources: for f in $(client_sources); do \ |