diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-08-03 21:51:37 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-08-03 21:51:37 +0200 |
| commit | 29bd01e6c11c0d9df7f556f157b1b00e06306f60 (patch) | |
| tree | e1463cc69b98560699aa561754652f5db4e1e3a2 /myisam | |
| parent | 5000893f39d0b885ebfad9c5ae7d2da83962ee9a (diff) | |
| download | mariadb-git-29bd01e6c11c0d9df7f556f157b1b00e06306f60.tar.gz | |
CMakeLists.txt, README, configure.js
Several adjustments to make client libraries pass the link test
on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
win/README:
- Removed references to PARTITION engine, 5.1 only
win/configure.js:
- Removed references to PARTITION engine, 5.1 only
extra/CMakeLists.txt:
Use the special 'debug' list element to mark that "dbug" library
is only to be linked against if build type "Debug".
myisam/CMakeLists.txt:
Use the special 'debug' list element to mark that "dbug" library
is only to be linked against if build type "Debug".
scripts/CMakeLists.txt:
Use the special 'debug' list element to mark that "dbug" library
is only to be linked against if build type "Debug".
server-tools/instance-manager/CMakeLists.txt:
Use the special 'debug' list element to mark that "dbug" library
is only to be linked against if build type "Debug".
sql/CMakeLists.txt:
Use the special 'debug' list element to mark that "dbug" library
is only to be linked against if build type "Debug".
mysys/CMakeLists.txt:
Restored include path to "mysys" itself
dbug/CMakeLists.txt:
Changed to optionally be included to give a file list only
extra/yassl/CMakeLists.txt:
Changed to optionally be included to give a file list only
extra/yassl/taocrypt/CMakeLists.txt:
Changed to optionally be included to give a file list only
zlib/CMakeLists.txt:
Changed to optionally be included to give a file list only
libmysql/CMakeLists.txt:
For compatibility with Visual Studio 2005, list all files that are to
be part of the library build, i.e. libraries can't be built from other
libraries. Set SOURCE_SUBLIBS and include the file listings from
"zlib", "dbug", "taocrypt" and "yassl"
Diffstat (limited to 'myisam')
| -rwxr-xr-x | myisam/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/myisam/CMakeLists.txt b/myisam/CMakeLists.txt index 94a7ffc9952..a557d61b87f 100755 --- a/myisam/CMakeLists.txt +++ b/myisam/CMakeLists.txt @@ -30,16 +30,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 debug dbug strings zlib wsock32) ADD_EXECUTABLE(myisamchk myisamchk.c) -TARGET_LINK_LIBRARIES(myisamchk myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(myisamchk myisam mysys debug dbug strings zlib wsock32) ADD_EXECUTABLE(myisamlog myisamlog.c) -TARGET_LINK_LIBRARIES(myisamlog myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(myisamlog myisam mysys debug dbug strings zlib wsock32) ADD_EXECUTABLE(myisampack myisampack.c) -TARGET_LINK_LIBRARIES(myisampack myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(myisampack myisam mysys debug dbug strings zlib wsock32) IF(EMBED_MANIFESTS) MYSQL_EMBED_MANIFEST("myisam_ftdump" "asInvoker") |