Browse Source
CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
Additional changes for bug#29903
- Changed to do embedded build part as normal build, when
WITH_EMBEDDED_SERVER is set.
- Allow both normal and debug build with embedded.
- Build static embedded library by pointing out all source and compile
it all, i.e. not building libraries from libraries, not portable.
- Let embedded use generated files from the "sql" directory, added
dependencies to make sure built before embedded.
- Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
linked in when debug target is used.
- Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
others can't depend on it, not defined at configure time. Instead
set the output file name.
- Created work around for bug in CMake 2.4.6 and output names, to
set the "mysqld<suffix>.pdb" name to the same base name.
- Set the correct manifest "name" (patch by iggy)
CMakeLists.txt:
Changes for embedded and Windows
libmysql/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/examples/CMakeLists.txt:
Changes for embedded and Windows
mysys/CMakeLists.txt:
Changes for embedded and Windows
regex/CMakeLists.txt:
Changes for embedded and Windows
server-tools/instance-manager/CMakeLists.txt:
Changes for embedded and Windows
sql/CMakeLists.txt:
Changes for embedded and Windows
storage/archive/CMakeLists.txt:
Changes for embedded and Windows
storage/blackhole/CMakeLists.txt:
Changes for embedded and Windows
storage/csv/CMakeLists.txt:
Changes for embedded and Windows
storage/example/CMakeLists.txt:
Changes for embedded and Windows
storage/federated/CMakeLists.txt:
Changes for embedded and Windows
storage/heap/CMakeLists.txt:
Changes for embedded and Windows
storage/innobase/CMakeLists.txt:
Changes for embedded and Windows
storage/myisam/CMakeLists.txt:
Changes for embedded and Windows
storage/myisammrg/CMakeLists.txt:
Changes for embedded and Windows
strings/CMakeLists.txt:
Changes for embedded and Windows
vio/CMakeLists.txt:
Changes for embedded and Windows
win/README:
Changes for embedded and Windows
win/configure.js:
Changes for embedded and Windows
win/mysql_manifest.cmake:
Changes for embedded and Windows
pull/374/head
22 changed files with 326 additions and 254 deletions
-
34CMakeLists.txt
-
25libmysql/CMakeLists.txt
-
229libmysqld/CMakeLists.txt
-
12libmysqld/examples/CMakeLists.txt
-
11mysys/CMakeLists.txt
-
7regex/CMakeLists.txt
-
2server-tools/instance-manager/CMakeLists.txt
-
107sql/CMakeLists.txt
-
8storage/archive/CMakeLists.txt
-
7storage/blackhole/CMakeLists.txt
-
7storage/csv/CMakeLists.txt
-
7storage/example/CMakeLists.txt
-
10storage/federated/CMakeLists.txt
-
10storage/heap/CMakeLists.txt
-
16storage/innobase/CMakeLists.txt
-
41storage/myisam/CMakeLists.txt
-
10storage/myisammrg/CMakeLists.txt
-
7strings/CMakeLists.txt
-
8vio/CMakeLists.txt
-
18win/README
-
2win/configure.js
-
2win/mysql_manifest.cmake
Write
Preview
Loading…
Cancel
Save
Reference in new issue