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
24e29bf9
Commit
24e29bf9
authored
Mar 16, 2006
by
knielsen@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Windows CMake dependency problem.
parent
0ae0f2cd
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
21 deletions
+16
-21
client/cmakelists.txt
client/cmakelists.txt
+1
-1
extra/cmakelists.txt
extra/cmakelists.txt
+10
-10
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
win/README
win/README
+2
-7
No files found.
client/cmakelists.txt
View file @
24e29bf9
...
...
@@ -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
GenErro
r
)
ADD_DEPENDENCIES
(
mysqlclient
comp_er
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
)
...
...
extra/cmakelists.txt
View file @
24e29bf9
...
...
@@ -8,16 +8,16 @@ TARGET_LINK_LIBRARIES(comp_err dbug mysys strings wsock32)
GET_TARGET_PROPERTY
(
COMP_ERR_EXE comp_err LOCATION
)
ADD_CUSTOM_
TARGET
(
GenError
${
COMP_ERR_EXE
}
--charset=
${
PROJECT_SOURCE_DIR
}
/sql/share/charsets
--out-dir=
${
PROJECT_SOURCE_DIR
}
/sql/share/
--header_file=
${
PROJECT_SOURCE_DIR
}
/include/mysqld_error.h
--name_file=
${
PROJECT_SOURCE_DIR
}
/include/mysqld_ername.h
--state_file=
${
PROJECT_SOURCE_DIR
}
/include/sql_stat
e.h
--in_file=
${
PROJECT_SOURCE_DIR
}
/sql/share/errmsg.txt
DEPENDS comp_err
${
PROJECT_SOURCE_DIR
}
/sql/share/errmsg.txt
)
ADD_CUSTOM_
COMMAND
(
OUTPUT
${
PROJECT_SOURCE_DIR
}
/include/mysqld_error.h
COMMAND
${
COMP_ERR_EXE
}
--charset=
${
PROJECT_SOURCE_DIR
}
/sql/share/charsets
--out-dir=
${
PROJECT_SOURCE_DIR
}
/sql/share/
--header_file=
${
PROJECT_SOURCE_DIR
}
/include/mysqld_error.h
--name_file=
${
PROJECT_SOURCE_DIR
}
/include/mysqld_ernam
e.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
)
ADD_EXECUTABLE
(
my_print_defaults my_print_defaults.c
)
TARGET_LINK_LIBRARIES
(
my_print_defaults strings mysys dbug taocrypt odbc32 odbccp32 wsock32
)
...
...
libmysql/cmakelists.txt
View file @
24e29bf9
...
...
@@ -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
GenErro
r zlib
)
ADD_DEPENDENCIES
(
libmysql dbug vio mysys strings
comp_er
r zlib
)
TARGET_LINK_LIBRARIES
(
libmysql mysys strings wsock32
)
# ToDo: We should move the mytest.c program out in libmysql/
...
...
server-tools/instance-manager/cmakelists.txt
View file @
24e29bf9
...
...
@@ -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
GenErro
r
)
ADD_DEPENDENCIES
(
mysqlmanager
comp_er
r
)
TARGET_LINK_LIBRARIES
(
mysqlmanager dbug mysys strings taocrypt vio yassl zlib wsock32
)
sql/cmakelists.txt
View file @
24e29bf9
...
...
@@ -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
GenErro
r
)
ADD_DEPENDENCIES
(
mysqld
comp_er
r
)
# Sql Parser custom command
ADD_CUSTOM_COMMAND
(
...
...
win/README
View file @
24e29bf9
...
...
@@ -60,16 +60,11 @@ click the build solution menu option.
Current issues
--------------
1. Dependencies are not handled correctly with the current scripts. What
this means is that a new error file may not be generated when the errmsg.txt
file changes. In this case, simply force the GenError target to build. This
should execute comp_err to generate the required files.
2. Not all configurations are currently available. i.e. Classic, Pro, Max.
1. Not all configurations are currently available. i.e. Classic, Pro, Max.
Currently, only debug and release are available. This will change in the near
future.
3
. The definitions set for features (partitioning, blackhole, etc) are not
2
. The definitions set for features (partitioning, blackhole, etc) are not
changed based on the options given with configure. This will soon be fixed
as well.
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