diff options
| author | unknown <knielsen@mysql.com> | 2006-03-23 16:34:52 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-03-23 16:34:52 +0100 |
| commit | f19b2c0a000ddec74a0cc673f94a7b3a3118c27b (patch) | |
| tree | 468e4f62dd1d5957ac25e9aac949adb6580182e1 /mysys | |
| parent | e29144b4b5bedd1239c0045f73316a42eda1521d (diff) | |
| download | mariadb-git-f19b2c0a000ddec74a0cc673f94a7b3a3118c27b.tar.gz | |
Updated CMake stuff to handle the configurations needed for release
builds.
cmakelists.txt:
Get the correct options for storage engines and defines from
config-version.js.
mysys/cmakelists.txt:
Set USE_TLS only for release builds, as it crashes in debug builds.
sql/cmakelists.txt:
Fix build options to only include the configured storage engines.
sql/mysqld.cc:
Fix dummy innodb declarations, otherwise non-innodb build fails.
storage/bdb/cmakelists.txt:
Create cmakelists.txt for BDB.
win/README:
Update with new configure.js options.
win/config-handlerton.js:
Extend with more storage engines.
win/config-version.js:
Extend to handle storage engines and other configuration parameters.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/cmakelists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mysys/cmakelists.txt b/mysys/cmakelists.txt index 1048bf61eec..5a3b8f1657e 100644 --- a/mysys/cmakelists.txt +++ b/mysys/cmakelists.txt @@ -1,8 +1,13 @@ +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") + # Need to set USE_TLS, since mysys is linked into libmysql.dll and # libmysqld.dll, and __declspec(thread) approach to thread local storage does # not work properly in DLLs. -SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR -DUSE_TLS") -SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR -DUSE_TLS") +# Currently, USE_TLS crashes in Debug builds, so until that is fixed Debug +# .dlls cannot be loaded at runtime. +SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DUSE_TLS") +SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DUSE_TLS") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/include) ADD_LIBRARY(mysys array.c charset-def.c charset.c checksum.c default.c default_modify.c |