diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-08-04 00:44:51 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-08-04 00:44:51 +0200 |
| commit | c4c200749a200a7e89ecc6d09c3c41941e0ff50e (patch) | |
| tree | 5e647c8d2eafbe6efdbb0d34399a6cd420049da2 /mysys | |
| parent | f2204146721cd2257ccc1f5954db680aa58b06ed (diff) | |
| parent | e31f5611aadf37fb7436de255120cbc8bcbb4fb5 (diff) | |
| download | mariadb-git-c4c200749a200a7e89ecc6d09c3c41941e0ff50e.tar.gz | |
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
libmysql/CMakeLists.txt:
merge fix
Diffstat (limited to 'mysys')
| -rwxr-xr-x | mysys/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index 08279eda00c..9fb9a47dad3 100755 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -28,7 +28,7 @@ IF(EMBEDDED_ONLY) ADD_DEFINITIONS(-DEMBEDDED_LIBRARY) ENDIF(EMBEDDED_ONLY) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/include) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/mysys) ADD_LIBRARY(mysys array.c charset-def.c charset.c checksum.c default.c default_modify.c errors.c hash.c list.c md5.c mf_brkhant.c mf_cache.c mf_dirname.c mf_fn_ext.c |