diff options
| author | unknown <knielsen@mysql.com> | 2006-03-24 22:50:56 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-03-24 22:50:56 +0100 |
| commit | 230eab3c68cb26fa743e82d0452f0b83359a10ff (patch) | |
| tree | 4a3cb807ddfab7cd04cb6caf42623f824843f884 /libmysql/cmakelists.txt | |
| parent | a69a37835c1b3823b359b7a4e1ae7bdafd33a08a (diff) | |
| download | mariadb-git-230eab3c68cb26fa743e82d0452f0b83359a10ff.tar.gz | |
Some changes to make it possible to build for Windows with CMake from
a normal 'make dist' source .tar.gz.
libmysql/mytest.c:
bk cp VC++Files/libmysqltest/mytest.c libmysql/mytest.c
sql/message.mc:
bk cp VC++Files/sql/message.mc sql/message.mc
Makefile.am:
Add Windows CMake stuff.
client/Makefile.am:
Add extra files needed for CMake Windows build.
cmakelists.txt:
Fix subdir order to make CMake dependency calculations happy.
configure.in:
Add extra files needed for CMake Windows build.
extra/Makefile.am:
Add extra files needed for CMake Windows build.
extra/yassl/Makefile.am:
Add extra files needed for CMake Windows build.
libmysql/Makefile.am:
Add extra files needed for CMake Windows build.
libmysql/cmakelists.txt:
Move mytest.c to a more sensible location.
libmysqld/Makefile.am:
Add extra files needed for CMake Windows build.
mysys/Makefile.am:
Add extra files needed for CMake Windows build.
regex/Makefile.am:
Add extra files needed for CMake Windows build.
server-tools/instance-manager/Makefile.am:
Add extra files needed for CMake Windows build.
sql/Makefile.am:
Add extra files needed for CMake Windows build.
sql/cmakelists.txt:
Move message.mc to a more sensible location.
Add some dependencies to avoid a stale handlerton.cc.
storage/archive/Makefile.am:
Add extra files needed for CMake Windows build.
storage/bdb/Makefile.in:
Add extra files needed for CMake Windows build.
storage/example/Makefile.am:
Add extra files needed for CMake Windows build.
storage/heap/Makefile.am:
Add extra files needed for CMake Windows build.
storage/innobase/Makefile.am:
Add extra files needed for CMake Windows build.
storage/innobase/include/univ.i:
Avoid including Unix config in Windows build.
storage/myisam/Makefile.am:
Add extra files needed for CMake Windows build.
storage/myisammrg/Makefile.am:
Add extra files needed for CMake Windows build.
strings/Makefile.am:
Add extra files needed for CMake Windows build.
tests/Makefile.am:
Add extra files needed for CMake Windows build.
vio/Makefile.am:
Add extra files needed for CMake Windows build.
zlib/Makefile.am:
Add extra files needed for CMake Windows build.
Diffstat (limited to 'libmysql/cmakelists.txt')
| -rw-r--r-- | libmysql/cmakelists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libmysql/cmakelists.txt b/libmysql/cmakelists.txt index 983799a8aca..35795102082 100644 --- a/libmysql/cmakelists.txt +++ b/libmysql/cmakelists.txt @@ -50,6 +50,5 @@ ADD_LIBRARY(libmysql MODULE dll.c libmysql.def ADD_DEPENDENCIES(libmysql dbug vio mysys strings GenError zlib yassl taocrypt) TARGET_LINK_LIBRARIES(libmysql mysys strings wsock32) -# ToDo: We should move the mytest.c program out in libmysql/ -ADD_EXECUTABLE(myTest ../VC++Files/libmysqltest/mytest.c) +ADD_EXECUTABLE(myTest mytest.c) TARGET_LINK_LIBRARIES(myTest libmysql) |