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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
4a166c2f
Commit
4a166c2f
authored
Mar 28, 2006
by
reggie@big_geek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some simple CMAKE updates
parent
f8ed0473
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
82 additions
and
51 deletions
+82
-51
cmakelists.txt
cmakelists.txt
+28
-17
sql/cmakelists.txt
sql/cmakelists.txt
+49
-34
storage/csv/cmakelists.txt
storage/csv/cmakelists.txt
+5
-0
No files found.
cmakelists.txt
View file @
4a166c2f
...
@@ -3,34 +3,45 @@ PROJECT(MySql)
...
@@ -3,34 +3,45 @@ PROJECT(MySql)
# This reads user configuration, generated by configure.js.
# This reads user configuration, generated by configure.js.
INCLUDE
(
win/configure.data
)
INCLUDE
(
win/configure.data
)
CONFIGURE_FILE
(
${
CMAKE_SOURCE_DIR
}
/include/mysql_version.h.in
${
CMAKE_SOURCE_DIR
}
/include/mysql_version.h @ONLY
)
CONFIGURE_FILE
(
${
CMAKE_SOURCE_DIR
}
/include/mysql_version.h.in
${
CMAKE_SOURCE_DIR
}
/include/mysql_version.h @ONLY
)
# in some places we use DBUG_OFF
# in some places we use DBUG_OFF
SET
(
CMAKE_CXX_FLAGS_RELEASE
"
${
CMAKE_CXX_FLAGS_RELEASE
}
-D DBUG_OFF"
)
SET
(
CMAKE_CXX_FLAGS_RELEASE
"
${
CMAKE_CXX_FLAGS_RELEASE
}
-D DBUG_OFF"
)
SET
(
CMAKE_C_FLAGS_RELEASE
"
${
CMAKE_C_FLAGS_RELEASE
}
-D DBUG_OFF"
)
SET
(
CMAKE_C_FLAGS_RELEASE
"
${
CMAKE_C_FLAGS_RELEASE
}
-D DBUG_OFF"
)
#
IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
IF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 8"
)
#
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
/wd4996"
)
#
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")
SET
(
CMAKE_CXX_FLAGS_RELEASE
"
${
CMAKE_CXX_FLAGS_RELEASE
}
/wd4996"
)
#
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /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_RELEASE
"
${
CMAKE_C_FLAGS_RELEASE
}
/wd4996"
)
#
ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
ENDIF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 8"
)
IF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 7"
OR CMAKE_GENERATOR MATCHES
"Visual Studio 8"
)
IF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 7"
OR
CMAKE_GENERATOR MATCHES
"Visual Studio 8"
)
# replace /MDd with /MTd
# replace /MDd with /MTd
STRING
(
REPLACE
"/MDd"
"/MTd"
CMAKE_CXX_FLAGS_DEBUG_INIT
${
CMAKE_CXX_FLAGS_DEBUG_INIT
}
)
STRING
(
REPLACE
"/MDd"
"/MTd"
CMAKE_CXX_FLAGS_DEBUG_INIT
STRING
(
REPLACE
"/MDd"
"/MTd"
CMAKE_C_FLAGS_DEBUG_INIT
${
CMAKE_C_FLAGS_DEBUG_INIT
}
)
${
CMAKE_CXX_FLAGS_DEBUG_INIT
}
)
STRING
(
REPLACE
"/MD"
"/MT"
CMAKE_C_FLAGS_RELEASE
${
CMAKE_C_FLAGS_RELEASE
}
)
STRING
(
REPLACE
"/MDd"
"/MTd"
CMAKE_C_FLAGS_DEBUG_INIT
STRING
(
REPLACE
"/MDd"
"/MTd"
CMAKE_C_FLAGS_DEBUG
${
CMAKE_C_FLAGS_DEBUG
}
)
${
CMAKE_C_FLAGS_DEBUG_INIT
}
)
STRING
(
REPLACE
"/MD"
"/MT"
CMAKE_CXX_FLAGS_RELEASE
${
CMAKE_CXX_FLAGS_RELEASE
}
)
STRING
(
REPLACE
"/MD"
"/MT"
CMAKE_C_FLAGS_RELEASE
STRING
(
REPLACE
"/MDd"
"/MTd"
CMAKE_CXX_FLAGS_DEBUG
${
CMAKE_CXX_FLAGS_DEBUG
}
)
${
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
}
)
# remove support for Exception handling
# remove support for Exception handling
STRING
(
REPLACE
"/GX"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
STRING
(
REPLACE
"/GX"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
STRING
(
REPLACE
"/EHsc"
""
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_INIT
STRING
(
REPLACE
"/EHsc"
""
CMAKE_CXX_FLAGS_DEBUG_INIT
${
CMAKE_CXX_FLAGS_DEBUG_INIT
}
)
${
CMAKE_CXX_FLAGS_INIT
}
)
ENDIF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 7"
OR CMAKE_GENERATOR MATCHES
"Visual Studio 8"
)
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"
)
ADD_DEFINITIONS
(
"-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE"
)
ADD_DEFINITIONS
(
"-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE"
)
...
...
sql/cmakelists.txt
View file @
4a166c2f
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR"
)
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
...
@@ -18,7 +20,8 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc
...
@@ -18,7 +20,8 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc
${
CMAKE_SOURCE_DIR
}
/sql/lex_hash.h
${
CMAKE_SOURCE_DIR
}
/sql/lex_hash.h
${
PROJECT_SOURCE_DIR
}
/include/mysqld_error.h
${
PROJECT_SOURCE_DIR
}
/include/mysqld_error.h
${
PROJECT_SOURCE_DIR
}
/include/mysqld_ername.h
${
PROJECT_SOURCE_DIR
}
/include/mysqld_ername.h
${
PROJECT_SOURCE_DIR
}
/include/sql_state.h PROPERTIES GENERATED 1
)
${
PROJECT_SOURCE_DIR
}
/include/sql_state.h
PROPERTIES GENERATED 1
)
IF
(
WITH_ARCHIVE_STORAGE_ENGINE
)
IF
(
WITH_ARCHIVE_STORAGE_ENGINE
)
ADD_DEFINITIONS
(
-D WITH_ARCHIVE_STORAGE_ENGINE
)
ADD_DEFINITIONS
(
-D WITH_ARCHIVE_STORAGE_ENGINE
)
...
@@ -67,30 +70,40 @@ ENDIF(__NT__)
...
@@ -67,30 +70,40 @@ ENDIF(__NT__)
IF
(
CYBOZU
)
IF
(
CYBOZU
)
ADD_DEFINITIONS
(
-D CYBOZU
)
ADD_DEFINITIONS
(
-D CYBOZU
)
ENDIF
(
CYBOZU
)
ENDIF
(
CYBOZU
)
CONFIGURE_FILE
(
${
CMAKE_SOURCE_DIR
}
/sql/handlerton.cc.in
${
CMAKE_SOURCE_DIR
}
/sql/handlerton.cc @ONLY
)
CONFIGURE_FILE
(
${
CMAKE_SOURCE_DIR
}
/sql/handlerton.cc.in
${
CMAKE_SOURCE_DIR
}
/sql/handlerton.cc @ONLY
)
ADD_DEFINITIONS
(
-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN
)
ADD_DEFINITIONS
(
-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER
-D_CONSOLE -DHAVE_DLOPEN
)
SEPARATE_ARGUMENTS
(
mysql_se_ha_src
)
SEPARATE_ARGUMENTS
(
mysql_se_ha_src
)
ADD_EXECUTABLE
(
mysqld ../sql-common/client.c derror.cc des_key_file.cc discover.cc ../libmysql/errmsg.c field.cc
ADD_EXECUTABLE
(
mysqld ../sql-common/client.c derror.cc des_key_file.cc
field_conv.cc filesort.cc gstream.cc ha_heap.cc ha_myisam.cc ha_myisammrg.cc
discover.cc ../libmysql/errmsg.c field.cc field_conv.cc
${
mysql_se_ha_src
}
handler.cc hash_filo.cc hash_filo.h hostname.cc
filesort.cc gstream.cc ha_heap.cc ha_myisam.cc ha_myisammrg.cc
init.cc item.cc item_buff.cc item_cmpfunc.cc item_create.cc item_func.cc item_geofunc.cc
${
mysql_se_ha_src
}
handler.cc hash_filo.cc hash_filo.h
item_row.cc item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc item_uniq.cc
hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc
key.cc log.cc lock.cc log_event.cc message.rc message.h mf_iocache.cc
item_create.cc item_func.cc item_geofunc.cc item_row.cc
my_decimal.cc ../sql-common/my_time.c
item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc
../storage/myisammrg/myrg_rnext_same.c mysqld.cc net_serv.cc nt_servc.cc nt_servc.h opt_range.cc opt_range.h
item_uniq.cc key.cc log.cc lock.cc log_event.cc message.rc
opt_sum.cc ../sql-common/pack.c parse_file.cc password.c procedure.cc protocol.cc records.cc
message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c
repl_failsafe.cc rpl_filter.cc set_var.cc slave.cc sp.cc sp_cache.cc sp_head.cc
../storage/myisammrg/myrg_rnext_same.c mysqld.cc net_serv.cc
sp_pcontext.cc sp_rcontext.cc spatial.cc sql_acl.cc sql_analyse.cc sql_base.cc sql_cache.cc
nt_servc.cc nt_servc.h opt_range.cc opt_range.h opt_sum.cc
sql_class.cc sql_client.cc sql_crypt.cc sql_crypt.h sql_cursor.cc sql_db.cc sql_delete.cc
../sql-common/pack.c parse_file.cc password.c procedure.cc
sql_derived.cc sql_do.cc sql_error.cc sql_handler.cc sql_help.cc sql_insert.cc
protocol.cc records.cc repl_failsafe.cc rpl_filter.cc set_var.cc
sql_lex.cc sql_list.cc sql_load.cc sql_manager.cc sql_map.cc sql_parse.cc sql_partition.cc
slave.cc sp.cc sp_cache.cc sp_head.cc sp_pcontext.cc
sql_plugin.cc sql_prepare.cc sql_rename.cc sql_repl.cc sql_select.cc sql_show.cc
sp_rcontext.cc spatial.cc sql_acl.cc sql_analyse.cc sql_base.cc
sql_state.c sql_string.cc sql_table.cc sql_test.cc sql_trigger.cc sql_udf.cc sql_union.cc
sql_cache.cc sql_class.cc sql_client.cc sql_crypt.cc sql_crypt.h
sql_update.cc sql_view.cc strfunc.cc table.cc thr_malloc.cc time.cc tztime.cc
sql_cursor.cc sql_db.cc sql_delete.cc sql_derived.cc sql_do.cc
uniques.cc unireg.cc item_xmlfunc.cc rpl_tblmap.cc sql_binlog.cc event_executor.cc
sql_error.cc sql_handler.cc sql_help.cc sql_insert.cc sql_lex.cc
event_timed.cc sql_tablespace.cc event.cc ../sql-common/my_user.c partition_info.cc
sql_list.cc sql_load.cc sql_manager.cc sql_map.cc sql_parse.cc
sql_partition.cc sql_plugin.cc sql_prepare.cc sql_rename.cc
sql_repl.cc sql_select.cc sql_show.cc sql_state.c sql_string.cc
sql_table.cc sql_test.cc sql_trigger.cc sql_udf.cc sql_union.cc
sql_update.cc sql_view.cc strfunc.cc table.cc thr_malloc.cc
time.cc tztime.cc uniques.cc unireg.cc item_xmlfunc.cc
rpl_tblmap.cc sql_binlog.cc event_executor.cc event_timed.cc
sql_tablespace.cc event.cc ../sql-common/my_user.c
partition_info.cc
${
PROJECT_SOURCE_DIR
}
/sql/sql_yacc.cc
${
PROJECT_SOURCE_DIR
}
/sql/sql_yacc.cc
${
PROJECT_SOURCE_DIR
}
/sql/sql_yacc.h
${
PROJECT_SOURCE_DIR
}
/sql/sql_yacc.h
${
PROJECT_SOURCE_DIR
}
/include/mysqld_error.h
${
PROJECT_SOURCE_DIR
}
/include/mysqld_error.h
...
@@ -99,7 +112,8 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc discover.
...
@@ -99,7 +112,8 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc discover.
${
PROJECT_SOURCE_DIR
}
/include/mysql_version.h
${
PROJECT_SOURCE_DIR
}
/include/mysql_version.h
${
PROJECT_SOURCE_DIR
}
/sql/handlerton.cc
${
PROJECT_SOURCE_DIR
}
/sql/handlerton.cc
${
PROJECT_SOURCE_DIR
}
/sql/lex_hash.h
)
${
PROJECT_SOURCE_DIR
}
/sql/lex_hash.h
)
TARGET_LINK_LIBRARIES
(
mysqld heap myisam myisammrg mysys yassl zlib dbug yassl taocrypt strings vio regex wsock32
)
TARGET_LINK_LIBRARIES
(
mysqld heap myisam myisammrg mysys yassl zlib dbug yassl
taocrypt strings vio regex wsock32
)
IF
(
WITH_ARCHIVE_STORAGE_ENGINE
)
IF
(
WITH_ARCHIVE_STORAGE_ENGINE
)
TARGET_LINK_LIBRARIES
(
mysqld archive
)
TARGET_LINK_LIBRARIES
(
mysqld archive
)
ENDIF
(
WITH_ARCHIVE_STORAGE_ENGINE
)
ENDIF
(
WITH_ARCHIVE_STORAGE_ENGINE
)
...
@@ -119,7 +133,8 @@ ADD_DEPENDENCIES(mysqld GenError)
...
@@ -119,7 +133,8 @@ ADD_DEPENDENCIES(mysqld GenError)
ADD_CUSTOM_COMMAND
(
ADD_CUSTOM_COMMAND
(
SOURCE
${
PROJECT_SOURCE_DIR
}
/sql/sql_yacc.yy
SOURCE
${
PROJECT_SOURCE_DIR
}
/sql/sql_yacc.yy
OUTPUT
${
PROJECT_SOURCE_DIR
}
/sql/sql_yacc.cc
OUTPUT
${
PROJECT_SOURCE_DIR
}
/sql/sql_yacc.cc
COMMAND bison.exe ARGS -y -p MYSQL --defines=sql_yacc.h --output=sql_yacc.cc sql_yacc.yy
COMMAND bison.exe ARGS -y -p MYSQL --defines=sql_yacc.h
--output=sql_yacc.cc sql_yacc.yy
DEPENDS
${
PROJECT_SOURCE_DIR
}
/sql/sql_yacc.yy
)
DEPENDS
${
PROJECT_SOURCE_DIR
}
/sql/sql_yacc.yy
)
ADD_CUSTOM_COMMAND
(
ADD_CUSTOM_COMMAND
(
...
...
storage/csv/cmakelists.txt
0 → 100644
View file @
4a166c2f
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
ADD_LIBRARY
(
csv ha_tina.cc ha_tina.h
)
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
