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
ca4ec281
Commit
ca4ec281
authored
18 years ago
by
knielsen@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CMake Windows comp_error dependency fix after last push.
parent
cdc362e1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
6 deletions
+9
-6
client/cmakelists.txt
client/cmakelists.txt
+1
-1
extra/cmakelists.txt
extra/cmakelists.txt
+5
-2
libmysql/cmakelists.txt
libmysql/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
No files found.
client/cmakelists.txt
View file @
ca4ec281
...
...
@@ -48,7 +48,7 @@ ADD_LIBRARY(mysqlclient ../mysys/array.c ../strings/bchange.c ../strings/bmove.c
../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c
../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c
)
ADD_DEPENDENCIES
(
mysqlclient
comp_er
r
)
ADD_DEPENDENCIES
(
mysqlclient
GenErro
r
)
ADD_EXECUTABLE
(
mysql completion_hash.cc mysql.cc readline.cc sql_string.cc
)
LINK_DIRECTORIES
(
${
MYSQL_BINARY_DIR
}
/mysys
${
MYSQL_BINARY_DIR
}
/zlib
)
TARGET_LINK_LIBRARIES
(
mysql mysqlclient mysys yassl zlib dbug yassl taocrypt wsock32
)
...
...
This diff is collapsed.
Click to expand it.
extra/cmakelists.txt
View file @
ca4ec281
...
...
@@ -16,8 +16,11 @@ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/include/mysqld_error.h
--name_file=
${
PROJECT_SOURCE_DIR
}
/include/mysqld_ername.h
--state_file=
${
PROJECT_SOURCE_DIR
}
/include/sql_state.h
--in_file=
${
PROJECT_SOURCE_DIR
}
/sql/share/errmsg.txt
MAIN_DEPENDENCY comp_err
DEPENDS
${
PROJECT_SOURCE_DIR
}
/sql/share/errmsg.txt
)
DEPENDS comp_err
${
PROJECT_SOURCE_DIR
}
/sql/share/errmsg.txt
)
ADD_CUSTOM_TARGET
(
GenError
ALL
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 odbc32 odbccp32 wsock32
)
...
...
This diff is collapsed.
Click to expand it.
libmysql/cmakelists.txt
View file @
ca4ec281
...
...
@@ -45,7 +45,7 @@ ADD_LIBRARY(libmysql MODULE dll.c libmysql.def
../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
)
ADD_DEPENDENCIES
(
libmysql dbug vio mysys strings
comp_er
r zlib
)
ADD_DEPENDENCIES
(
libmysql dbug vio mysys strings
GenErro
r zlib
)
TARGET_LINK_LIBRARIES
(
libmysql mysys strings wsock32
)
# ToDo: We should move the mytest.c program out in libmysql/
...
...
This diff is collapsed.
Click to expand it.
server-tools/instance-manager/cmakelists.txt
View file @
ca4ec281
...
...
@@ -12,5 +12,5 @@ ADD_EXECUTABLE(mysqlmanager buffer.cc command.cc commands.cc guardian.cc instanc
../../sql/sql_state.c ../../sql-common/client.c ../../libmysql/get_password.c
../../libmysql/errmsg.c
)
ADD_DEPENDENCIES
(
mysqlmanager
comp_er
r
)
ADD_DEPENDENCIES
(
mysqlmanager
GenErro
r
)
TARGET_LINK_LIBRARIES
(
mysqlmanager dbug mysys strings taocrypt vio yassl zlib wsock32
)
This diff is collapsed.
Click to expand it.
sql/cmakelists.txt
View file @
ca4ec281
...
...
@@ -50,7 +50,7 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc discover.
${
PROJECT_SOURCE_DIR
}
/sql/handlerton.cc
${
PROJECT_SOURCE_DIR
}
/sql/lex_hash.h
)
TARGET_LINK_LIBRARIES
(
mysqld heap myisam myisammrg innobase mysys yassl zlib dbug yassl taocrypt strings vio regex wsock32
)
ADD_DEPENDENCIES
(
mysqld
comp_er
r
)
ADD_DEPENDENCIES
(
mysqld
GenErro
r
)
# Sql Parser custom command
ADD_CUSTOM_COMMAND
(
...
...
This diff is collapsed.
Click to expand it.
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