Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
6b9ac5b7
Commit
6b9ac5b7
authored
Aug 03, 2007
by
kent@kent-amd64.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
parents
5ad3f608
a6d082f3
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
116 additions
and
64 deletions
+116
-64
CMakeLists.txt
CMakeLists.txt
+33
-28
dbug/CMakeLists.txt
dbug/CMakeLists.txt
+8
-3
extra/CMakeLists.txt
extra/CMakeLists.txt
+4
-4
extra/yassl/CMakeLists.txt
extra/yassl/CMakeLists.txt
+9
-3
extra/yassl/taocrypt/CMakeLists.txt
extra/yassl/taocrypt/CMakeLists.txt
+6
-2
libmysql/CMakeLists.txt
libmysql/CMakeLists.txt
+42
-14
mysys/CMakeLists.txt
mysys/CMakeLists.txt
+1
-1
scripts/CMakeLists.txt
scripts/CMakeLists.txt
+1
-1
server-tools/instance-manager/CMakeLists.txt
server-tools/instance-manager/CMakeLists.txt
+1
-1
sql/CMakeLists.txt
sql/CMakeLists.txt
+1
-1
storage/myisam/CMakeLists.txt
storage/myisam/CMakeLists.txt
+4
-4
zlib/CMakeLists.txt
zlib/CMakeLists.txt
+6
-2
No files found.
CMakeLists.txt
View file @
6b9ac5b7
...
...
@@ -38,6 +38,15 @@ ENDIF(NOT EMBEDDED_ONLY)
CONFIGURE_FILE
(
${
CMAKE_SOURCE_DIR
}
/include/mysql_version.h.in
${
CMAKE_SOURCE_DIR
}
/include/mysql_version.h @ONLY
)
# Set standard options
ADD_DEFINITIONS
(
-D HAVE_YASSL
)
# Set debug options
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DFORCE_INIT_OF_VARS"
)
# Note that some engines are always compiled in, MyISAM, MyISAMMRG and HEAP,
# these three plugin defintions are dummys for symmetry
SET
(
WITH_HEAP_STORAGE_ENGINE TRUE
)
ADD_DEFINITIONS
(
-DWITH_HEAP_STORAGE_ENGINE
)
SET
(
mysql_plugin_defs
"
${
mysql_plugin_defs
}
,builtin_heap_plugin"
)
...
...
@@ -103,49 +112,43 @@ ENDIF(CYBOZU)
# in some places we use DBUG_OFF
SET
(
CMAKE_CXX_FLAGS_RELEASE
"
${
CMAKE_CXX_FLAGS_RELEASE
}
-DDBUG_OFF"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"
${
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
-D DBUG_OFF"
)
SET
(
CMAKE_C_FLAGS_RELEASE
"
${
CMAKE_C_FLAGS_RELEASE
}
-DDBUG_OFF"
)
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"
${
CMAKE_C_FLAGS_RELWITHDEBINFO
}
-D DBUG_OFF"
)
IF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 8"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
/wd4996"
)
SET
(
CMAKE_CXX_FLAGS_RELEASE
"
${
CMAKE_CXX_FLAGS_RELEASE
}
/wd4996"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"
${
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
/wd4996"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
/wd4996"
)
SET
(
CMAKE_C_FLAGS_RELEASE
"
${
CMAKE_C_FLAGS_RELEASE
}
/wd4996"
)
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"
${
CMAKE_C_FLAGS_RELWITHDEBINFO
}
/wd4996"
)
ENDIF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 8"
)
IF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 7"
OR
CMAKE_GENERATOR MATCHES
"Visual Studio 8"
)
# replace /MDd with /MTd
STRING
(
REPLACE
"/MDd"
"/MTd"
CMAKE_CXX_FLAGS_DEBUG_INIT
${
CMAKE_CXX_FLAGS_DEBUG_INIT
}
)
STRING
(
REPLACE
"/MDd"
"/MTd"
CMAKE_C_FLAGS_DEBUG_INIT
${
CMAKE_C_FLAGS_DEBUG_INIT
}
)
STRING
(
REPLACE
"/MD"
"/MT"
CMAKE_C_FLAGS_RELEASE
${
CMAKE_C_FLAGS_RELEASE
}
)
STRING
(
REPLACE
"/MDd"
"/MTd"
CMAKE_C_FLAGS_DEBUG
${
CMAKE_C_FLAGS_DEBUG
}
)
STRING
(
REPLACE
"/MD"
"/MT"
CMAKE_CXX_FLAGS_RELEASE
${
CMAKE_CXX_FLAGS_RELEASE
}
)
STRING
(
REPLACE
"/MDd"
"/MTd"
CMAKE_CXX_FLAGS_DEBUG
${
CMAKE_CXX_FLAGS_DEBUG
}
)
STRING
(
REPLACE
"/MD"
"/MT"
CMAKE_CXX_FLAGS_RELWITHDEBINFO
${
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
)
STRING
(
REPLACE
"/MD"
"/MT"
CMAKE_C_FLAGS_RELWITHDEBINFO
${
CMAKE_C_FLAGS_RELWITHDEBINFO
}
)
# replace /MDd with /MTd
STRING
(
REPLACE
"/MD"
"/MT"
CMAKE_C_FLAGS_RELEASE
${
CMAKE_C_FLAGS_RELEASE
}
)
STRING
(
REPLACE
"/MD"
"/MT"
CMAKE_C_FLAGS_RELWITHDEBINFO
${
CMAKE_C_FLAGS_RELWITHDEBINFO
}
)
STRING
(
REPLACE
"/MDd"
"/MTd"
CMAKE_C_FLAGS_DEBUG
${
CMAKE_C_FLAGS_DEBUG
}
)
STRING
(
REPLACE
"/MDd"
"/MTd"
CMAKE_C_FLAGS_DEBUG_INIT
${
CMAKE_C_FLAGS_DEBUG_INIT
}
)
STRING
(
REPLACE
"/MD"
"/MT"
CMAKE_CXX_FLAGS_RELEASE
${
CMAKE_CXX_FLAGS_RELEASE
}
)
STRING
(
REPLACE
"/MD"
"/MT"
CMAKE_CXX_FLAGS_RELWITHDEBINFO
${
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
)
STRING
(
REPLACE
"/MDd"
"/MTd"
CMAKE_CXX_FLAGS_DEBUG
${
CMAKE_CXX_FLAGS_DEBUG
}
)
STRING
(
REPLACE
"/MDd"
"/MTd"
CMAKE_CXX_FLAGS_DEBUG_INIT
${
CMAKE_CXX_FLAGS_DEBUG_INIT
}
)
# generate .map files
SET
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
/MAP /MAPINFO:EXPORTS"
)
# generate map files, set stack size (see bug#20815)
SET
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
/MAP /MAPINFO:EXPORTS"
)
SET
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
/STACK:1048576"
)
# set stack size (see bug#20815)
SET
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
/STACK:1048576"
)
# remove support for Exception handling
STRING
(
REPLACE
"/GX"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
STRING
(
REPLACE
"/EHsc"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
STRING
(
REPLACE
"/EHsc"
""
CMAKE_CXX_FLAGS_INIT
${
CMAKE_CXX_FLAGS_INIT
}
)
STRING
(
REPLACE
"/EHsc"
""
CMAKE_CXX_FLAGS_DEBUG_INIT
${
CMAKE_CXX_FLAGS_DEBUG_INIT
}
)
# remove support for Exception handling
STRING
(
REPLACE
"/GX"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
STRING
(
REPLACE
"/EHsc"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
STRING
(
REPLACE
"/EHsc"
""
CMAKE_CXX_FLAGS_INIT
${
CMAKE_CXX_FLAGS_INIT
}
)
STRING
(
REPLACE
"/EHsc"
""
CMAKE_CXX_FLAGS_DEBUG_INIT
${
CMAKE_CXX_FLAGS_DEBUG_INIT
}
)
ENDIF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 7"
OR
CMAKE_GENERATOR MATCHES
"Visual Studio 8"
)
...
...
@@ -209,6 +212,8 @@ IF(EMBED_MANIFESTS)
ENDIF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 8 2005 Win64"
)
ENDIF
(
EMBED_MANIFESTS
)
# FIXME "debug" only needed if build type is "Debug", but
# CMAKE_BUILD_TYPE is not set during configure time.
ADD_SUBDIRECTORY
(
vio
)
ADD_SUBDIRECTORY
(
dbug
)
ADD_SUBDIRECTORY
(
strings
)
...
...
dbug/CMakeLists.txt
View file @
6b9ac5b7
...
...
@@ -13,7 +13,12 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/dbug
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
ADD_LIBRARY
(
dbug dbug.c factorial.c sanity.c
)
SET
(
DBUG_SOURCES dbug.c factorial.c sanity.c
)
IF
(
NOT SOURCE_SUBLIBS
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
ADD_LIBRARY
(
dbug
${
DBUG_SOURCES
}
)
ENDIF
(
NOT SOURCE_SUBLIBS
)
extra/CMakeLists.txt
View file @
6b9ac5b7
...
...
@@ -20,7 +20,7 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
ADD_EXECUTABLE
(
comp_err comp_err.c
)
TARGET_LINK_LIBRARIES
(
comp_err dbug mysys strings zlib wsock32
)
TARGET_LINK_LIBRARIES
(
comp_err d
ebug d
bug mysys strings zlib wsock32
)
GET_TARGET_PROPERTY
(
COMP_ERR_EXE comp_err LOCATION
)
...
...
@@ -39,13 +39,13 @@ ADD_CUSTOM_TARGET(GenError
DEPENDS
${
PROJECT_SOURCE_DIR
}
/include/mysqld_error.h
)
ADD_EXECUTABLE
(
my_print_defaults my_print_defaults.c
)
TARGET_LINK_LIBRARIES
(
my_print_defaults strings mysys dbug taocrypt wsock32
)
TARGET_LINK_LIBRARIES
(
my_print_defaults strings mysys d
ebug d
bug taocrypt wsock32
)
ADD_EXECUTABLE
(
perror perror.c
)
TARGET_LINK_LIBRARIES
(
perror strings mysys dbug wsock32
)
TARGET_LINK_LIBRARIES
(
perror strings mysys d
ebug d
bug wsock32
)
ADD_EXECUTABLE
(
replace replace.c
)
TARGET_LINK_LIBRARIES
(
replace strings mysys dbug wsock32
)
TARGET_LINK_LIBRARIES
(
replace strings mysys d
ebug d
bug wsock32
)
IF
(
EMBED_MANIFESTS
)
MYSQL_EMBED_MANIFEST
(
"myTest"
"asInvoker"
)
...
...
extra/yassl/CMakeLists.txt
View file @
6b9ac5b7
...
...
@@ -13,9 +13,15 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
ADD_DEFINITIONS
(
"-DWIN32 -D_LIB -DYASSL_PREFIX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
${
CMAKE_SOURCE_DIR
}
/extra/yassl/taocrypt/include
${
CMAKE_SOURCE_DIR
}
/extra/yassl/taocrypt/mySTL
)
INCLUDE_DIRECTORIES
(
include taocrypt/include taocrypt/mySTL
)
ADD_LIBRARY
(
yassl src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp src/handshake.cpp src/lock.cpp
ADD_DEFINITIONS
(
"-D_LIB -DYASSL_PREFIX"
)
SET
(
YASSL_SOURCES src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp src/handshake.cpp src/lock.cpp
src/log.cpp src/socket_wrapper.cpp src/ssl.cpp src/timer.cpp src/yassl_error.cpp
src/yassl_imp.cpp src/yassl_int.cpp
)
IF
(
NOT SOURCE_SUBLIBS
)
ADD_LIBRARY
(
yassl
${
YASSL_SOURCES
}
)
ENDIF
(
NOT SOURCE_SUBLIBS
)
extra/yassl/taocrypt/CMakeLists.txt
View file @
6b9ac5b7
...
...
@@ -13,9 +13,10 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
INCLUDE_DIRECTORIES
(
mySTL include
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/extra/yassl/taocrypt/mySTL
${
CMAKE_SOURCE_DIR
}
/extra/yassl/taocrypt/include
)
ADD_LIBRARY
(
taocrypt
src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp src/asn.cpp src/coding.cpp
SET
(
TAOCRYPT_SOURCES
src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp src/asn.cpp src/coding.cpp
src/des.cpp src/dh.cpp src/dsa.cpp src/file.cpp src/hash.cpp src/integer.cpp src/md2.cpp
src/md4.cpp src/md5.cpp src/misc.cpp src/random.cpp src/ripemd.cpp src/rsa.cpp src/sha.cpp
include/aes.hpp include/algebra.hpp include/arc4.hpp include/asn.hpp include/block.hpp
...
...
@@ -23,3 +24,6 @@ ADD_LIBRARY(taocrypt src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp
include/error.hpp include/file.hpp include/hash.hpp include/hmac.hpp include/integer.hpp
include/md2.hpp include/md5.hpp include/misc.hpp include/modarith.hpp include/modes.hpp
include/random.hpp include/ripemd.hpp include/rsa.hpp include/sha.hpp
)
IF
(
NOT SOURCE_SUBLIBS
)
ADD_LIBRARY
(
taocrypt
${
TAOCRYPT_SOURCES
}
)
ENDIF
(
NOT SOURCE_SUBLIBS
)
libmysql/CMakeLists.txt
View file @
6b9ac5b7
...
...
@@ -24,13 +24,43 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
# have been a problem anyway, they don't use thread local storage.
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/zlib
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
${
CMAKE_SOURCE_DIR
}
/libmysql
${
CMAKE_SOURCE_DIR
}
/regex
${
CMAKE_SOURCE_DIR
}
/sql
${
CMAKE_SOURCE_DIR
}
/strings
)
# We include the source file listing instead of referencing the
# libraries. At least with CMake 2.4 and Visual Studio 2005 a static
# library created from other static libraries would not be complete,
# i.e. the libraries listed in TARGET_LINK_LIBRARIES() were just
# ignored.
# Include and add the directory path
SET
(
SOURCE_SUBLIBS TRUE
)
INCLUDE
(
${
CMAKE_SOURCE_DIR
}
/zlib/CMakeLists.txt
)
FOREACH
(
rpath
${
ZLIB_SOURCES
}
)
SET
(
LIB_SOURCES
${
LIB_SOURCES
}
../zlib/
${
rpath
}
)
ENDFOREACH
(
rpath
)
# FIXME only needed if build type is "Debug", but CMAKE_BUILD_TYPE is
# not set during configure time.
INCLUDE
(
${
CMAKE_SOURCE_DIR
}
/dbug/CMakeLists.txt
)
FOREACH
(
rpath
${
DBUG_SOURCES
}
)
SET
(
LIB_SOURCES
${
LIB_SOURCES
}
../dbug/
${
rpath
}
)
ENDFOREACH
(
rpath
)
INCLUDE
(
${
CMAKE_SOURCE_DIR
}
/extra/yassl/taocrypt/CMakeLists.txt
)
FOREACH
(
rpath
${
TAOCRYPT_SOURCES
}
)
SET
(
LIB_SOURCES
${
LIB_SOURCES
}
../extra/yassl/taocrypt/
${
rpath
}
)
ENDFOREACH
(
rpath
)
INCLUDE
(
${
CMAKE_SOURCE_DIR
}
/extra/yassl/CMakeLists.txt
)
FOREACH
(
rpath
${
YASSL_SOURCES
}
)
SET
(
LIB_SOURCES
${
LIB_SOURCES
}
../extra/yassl/
${
rpath
}
)
ENDFOREACH
(
rpath
)
SET
(
CLIENT_SOURCES ../mysys/array.c ../strings/bchange.c ../strings/bmove.c
../strings/bmove_upp.c ../mysys/charset-def.c ../mysys/charset.c
../sql-common/client.c ../strings/ctype-big5.c ../strings/ctype-bin.c
...
...
@@ -66,7 +96,8 @@ SET(CLIENT_SOURCES ../mysys/array.c ../strings/bchange.c ../strings/bmove.c
../strings/strmov.c ../strings/strnlen.c ../strings/strnmov.c ../strings/strtod.c
../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c
../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c
../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c
)
../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c
${
LIB_SOURCES
}
)
# Need to set USE_TLS for building the DLL, since __declspec(thread)
# approach to thread local storage does not work properly in DLLs.
...
...
@@ -79,23 +110,20 @@ SET(CLIENT_SOURCES ../mysys/array.c ../strings/bchange.c ../strings/bmove.c
# beond the documented API, and try access the Thread Local Storage.
# The "_notls" means no Tls*() functions used, i.e. "static" TLS.
ADD_LIBRARY
(
libmysql
SHARED dll.c libmysql.def
${
CLIENT_SOURCES
}
)
ADD_LIBRARY
(
mysqlclient STATIC
${
CLIENT_SOURCES
}
)
ADD_LIBRARY
(
libmysql
SHARED
${
CLIENT_SOURCES
}
dll.c libmysql.def
)
ADD_LIBRARY
(
mysqlclient
STATIC
${
CLIENT_SOURCES
}
)
ADD_LIBRARY
(
mysqlclient_notls STATIC
${
CLIENT_SOURCES
}
)
SET_TARGET_PROPERTIES
(
libmysql mysqlclient PROPERTIES COMPILE_FLAGS
"-DUSE_TLS"
)
SET
(
CLIENT_LIB_DEPS yassl taocrypt zlib dbug GenError
)
SET
(
CLIENT_LIBS yassl taocrypt zlib debug dbug
)
ADD_DEPENDENCIES
(
libmysql
${
CLIENT_LIB_DEPS
}
)
TARGET_LINK_LIBRARIES
(
libmysql
${
CLIENT_LIBS
}
wsock32
)
ADD_DEPENDENCIES
(
libmysql GenError
)
TARGET_LINK_LIBRARIES
(
libmysql wsock32
)
ADD_DEPENDENCIES
(
mysqlclient
${
CLIENT_LIB_DEPS
}
)
TARGET_LINK_LIBRARIES
(
mysqlclient
${
CLIENT_LIBS
}
)
ADD_DEPENDENCIES
(
mysqlclient
GenError
)
TARGET_LINK_LIBRARIES
(
mysqlclient
)
ADD_DEPENDENCIES
(
mysqlclient_notls
${
CLIENT_LIB_DEPS
}
)
TARGET_LINK_LIBRARIES
(
mysqlclient_notls
${
CLIENT_LIBS
}
)
ADD_DEPENDENCIES
(
mysqlclient_notls
GenError
)
TARGET_LINK_LIBRARIES
(
mysqlclient_notls
)
ADD_EXECUTABLE
(
myTest mytest.c
)
TARGET_LINK_LIBRARIES
(
myTest libmysql
)
...
...
mysys/CMakeLists.txt
View file @
6b9ac5b7
...
...
@@ -28,7 +28,7 @@ IF(EMBEDDED_ONLY)
ADD_DEFINITIONS
(
-DEMBEDDED_LIBRARY
)
ENDIF
(
EMBEDDED_ONLY
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/zlib
${
CMAKE_SOURCE_DIR
}
/include
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/zlib
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/mysys
)
ADD_LIBRARY
(
mysys array.c charset-def.c charset.c checksum.c default.c default_modify.c
errors.c hash.c list.c md5.c mf_brkhant.c mf_cache.c mf_dirname.c mf_fn_ext.c
...
...
scripts/CMakeLists.txt
View file @
6b9ac5b7
...
...
@@ -24,7 +24,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tabl
# Build comp_sql - used for embedding SQL in C or C++ programs
ADD_EXECUTABLE
(
comp_sql comp_sql.c
)
TARGET_LINK_LIBRARIES
(
comp_sql dbug mysys strings
)
TARGET_LINK_LIBRARIES
(
comp_sql d
ebug d
bug mysys strings
)
# Use comp_sql to build mysql_fix_privilege_tables_sql.c
GET_TARGET_PROPERTY
(
COMP_SQL_EXE comp_sql LOCATION
)
...
...
server-tools/instance-manager/CMakeLists.txt
View file @
6b9ac5b7
...
...
@@ -31,7 +31,7 @@ ADD_EXECUTABLE(mysqlmanager buffer.cc command.cc commands.cc guardian.cc instanc
../../libmysql/errmsg.c
)
ADD_DEPENDENCIES
(
mysqlmanager GenError
)
TARGET_LINK_LIBRARIES
(
mysqlmanager dbug mysys strings taocrypt vio yassl zlib wsock32
)
TARGET_LINK_LIBRARIES
(
mysqlmanager d
ebug d
bug mysys strings taocrypt vio yassl zlib wsock32
)
IF
(
EMBED_MANIFESTS
)
MYSQL_EMBED_MANIFEST
(
"mysqlmanager"
"asInvoker"
)
...
...
sql/CMakeLists.txt
View file @
6b9ac5b7
...
...
@@ -84,7 +84,7 @@ ADD_EXECUTABLE(mysqld${MYSQLD_EXE_SUFFIX}
${
PROJECT_SOURCE_DIR
}
/sql/sql_builtin.cc
${
PROJECT_SOURCE_DIR
}
/sql/lex_hash.h
)
TARGET_LINK_LIBRARIES
(
mysqld
${
MYSQLD_EXE_SUFFIX
}
heap myisam myisammrg mysys yassl zlib dbug yassl
heap myisam myisammrg mysys yassl zlib d
ebug d
bug yassl
taocrypt strings vio regex wsock32 ws2_32
)
IF
(
EMBED_MANIFESTS
)
...
...
storage/myisam/CMakeLists.txt
View file @
6b9ac5b7
...
...
@@ -38,16 +38,16 @@ ADD_LIBRARY(myisam ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.c f
rt_split.c sort.c sp_key.c ft_eval.h myisamdef.h rt_index.h mi_rkey.c
)
ADD_EXECUTABLE
(
myisam_ftdump myisam_ftdump.c
)
TARGET_LINK_LIBRARIES
(
myisam_ftdump myisam mysys dbug strings zlib wsock32
)
TARGET_LINK_LIBRARIES
(
myisam_ftdump myisam mysys d
ebug d
bug strings zlib wsock32
)
ADD_EXECUTABLE
(
myisamchk myisamchk.c
)
TARGET_LINK_LIBRARIES
(
myisamchk myisam mysys dbug strings zlib wsock32
)
TARGET_LINK_LIBRARIES
(
myisamchk myisam mysys d
ebug d
bug strings zlib wsock32
)
ADD_EXECUTABLE
(
myisamlog myisamlog.c
)
TARGET_LINK_LIBRARIES
(
myisamlog myisam mysys dbug strings zlib wsock32
)
TARGET_LINK_LIBRARIES
(
myisamlog myisam mysys d
ebug d
bug strings zlib wsock32
)
ADD_EXECUTABLE
(
myisampack myisampack.c
)
TARGET_LINK_LIBRARIES
(
myisampack myisam mysys dbug strings zlib wsock32
)
TARGET_LINK_LIBRARIES
(
myisampack myisam mysys d
ebug d
bug strings zlib wsock32
)
IF
(
EMBED_MANIFESTS
)
MYSQL_EMBED_MANIFEST
(
"myisam_ftdump"
"asInvoker"
)
...
...
zlib/CMakeLists.txt
View file @
6b9ac5b7
...
...
@@ -18,9 +18,13 @@
# Not directly and indirectly using any of the macros for creating and
# using the storage, pthread_key*(), {,my_}{set,get}_specific*() ....
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/zlib
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-D_DEBUG"
)
ADD_LIBRARY
(
zlib
adler32.c compress.c crc32.c crc32.h deflate.c deflate.h gzio.c infback.c inffast.c inffast.h
SET
(
ZLIB_SOURCES
adler32.c compress.c crc32.c crc32.h deflate.c deflate.h gzio.c infback.c inffast.c inffast.h
inffixed.h inflate.c inflate.h inftrees.c inftrees.h trees.c trees.h uncompr.c zconf.h zlib.h
zutil.c zutil.h
)
IF
(
NOT SOURCE_SUBLIBS
)
ADD_LIBRARY
(
zlib
${
ZLIB_SOURCES
}
)
ENDIF
(
NOT SOURCE_SUBLIBS
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
