database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug#29903 The CMake build method does not produce the embedded library.

Browse Source 
- Changes to correct and test Windows embedded build.


BitKeeper/etc/ignore:
  Bug#29903 The CMake build method does not produce the embedded library.
  - Ignore auto-generated Windows embedded resources.
CMakeLists.txt:
  Bug#29903 The CMake build method does not produce the embedded library.
  - Hardcode CSV for all configurations.
  - Add client directory for gen_lex_hash dependency.
client/CMakeLists.txt:
  Bug#29903 The CMake build method does not produce the embedded library.
  - Build the mysqlclient library and echo for the embedded solution.
client/client_priv.h:
  Bug#29903 The CMake build method does not produce the embedded library.
  - Defined new option.
client/mysql.cc:
  Bug#29903 The CMake build method does not produce the embedded library.
  - Add server-arg command line parameter
libmysqld/CMakeLists.txt:
  Bug#29903 The CMake build method does not produce the embedded library.
  - Added auto generated resources; sql_yacc.cc, sql_yacc.h, message.rc
  message.h and lex_hash.h.
  - Link csv library to libmsyqld.
libmysqld/Makefile.am:
  Bug#29903 The CMake build method does not produce the embedded library.
  - Include CMakeLists.txt in dist.
libmysqld/examples/CMakeLists.txt:
  Bug#29903 The CMake build method does not produce the embedded library.
  - Follow existing naming convention.
libmysqld/examples/Makefile.am:
  Bug#29903 The CMake build method does not produce the embedded library.
  - Include CMakeLists.txt in dist.
mysql-test/mysql-test-run.pl:
  Bug#29903 The CMake build method does not produce the embedded library.
  - Move embedded option block earlier in the script.
  - Added the path to the libmysqld.dll to Windows path.
win/README:
  Bug#29903 The CMake build method does not produce the embedded library.
  - Add instructions for building/testing the embedded library.
This commit is contained in:
unknown
2007-08-03 14:43:12 -04:00
parent 6f88aa45db
commit c6c57ed783
11 changed files with 202 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libmysqld/examples/CMakeLists.txt
View File

@ -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)

1
libmysqld/examples/Makefile.am
View File

@ -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 \