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.
This commit is contained in:
unknown 2006-03-24 22:50:56 +01:00
commit 230eab3c68
29 changed files with 248 additions and 27 deletions

View file

@ -67,10 +67,10 @@ ADD_CUSTOM_COMMAND(
# Windows message file
ADD_CUSTOM_COMMAND(
SOURCE ../VC++Files/sql/message.mc
SOURCE message.mc
OUTPUT message.rc message.h
COMMAND mc ARGS ../VC++Files/sql/message.mc
DEPENDS ../VC++Files/sql/message.mc)
COMMAND mc ARGS message.mc
DEPENDS message.mc)
# MySql_version.h.
#ADD_CUSTOM_COMMAND(
@ -84,7 +84,9 @@ ADD_CUSTOM_COMMAND(
SOURCE ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in
OUTPUT ${PROJECT_SOURCE_DIR}/sql/handlerton.cc
COMMAND cscript.exe ${PROJECT_SOURCE_DIR}/win/config-handlerton.js ARGS ${PROJECT_SOURCE_DIR}/win/configure.data
DEPENDS ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in)
DEPENDS ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in
${PROJECT_SOURCE_DIR}/win/configure.data
${PROJECT_SOURCE_DIR}/win/config-handlerton.js)
# Error file
#GET_TARGET_PROPERTY(COMP_ERR_EXE comp_err LOCATION)