diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-04 13:26:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-12 17:46:35 +0200 |
| commit | 1fc49d3d1a2771bbf55146e458465b2b116edfd4 (patch) | |
| tree | 83a92bc88afe1b935d6c46f45f955c27ee140dbd /CMakeLists.txt | |
| parent | ca02ad4fb075db525431d700ff86b5ead6d9b7fd (diff) | |
| download | mariadb-git-1fc49d3d1a2771bbf55146e458465b2b116edfd4.tar.gz | |
Add C/C as a submodule in libmariadb/
also
* fix includes
* rename cmake macros and targets to avoid name clashes
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fa5d102e18..055be07025d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -362,8 +362,7 @@ ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(vio) ADD_SUBDIRECTORY(mysys) ADD_SUBDIRECTORY(mysys_ssl) -ADD_SUBDIRECTORY(libmariadb) -ADD_SUBDIRECTORY(libmysql) +INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) |