diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-15 10:26:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-15 10:26:08 +0400 |
| commit | a9240dce9e2f32941611b4f1a52e3b30a1508fc2 (patch) | |
| tree | ab7a7ec71341e29676d9a6bb039aeface4f88ce6 /libmysqld/CMakeLists.txt | |
| parent | 2c0a073970cf5f1dc679b34bb13e7fc55109dfd0 (diff) | |
| parent | eb2c6f451392396ef2ca74f1dba761fc4459d171 (diff) | |
| download | mariadb-git-a9240dce9e2f32941611b4f1a52e3b30a1508fc2.tar.gz | |
Merge 10.0-base -> 10.0
Diffstat (limited to 'libmysqld/CMakeLists.txt')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 91e4d9aa80b..874428d456c 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -22,7 +22,8 @@ ${CMAKE_SOURCE_DIR}/libmysql ${CMAKE_SOURCE_DIR}/libmysqld ${CMAKE_SOURCE_DIR}/sql ${CMAKE_BINARY_DIR}/sql -${CMAKE_SOURCE_DIR}/regex +${CMAKE_BINARY_DIR}/pcre +${CMAKE_SOURCE_DIR}/pcre ${ZLIB_INCLUDE_DIR} ${SSL_INCLUDE_DIRS} ${SSL_INTERNAL_INCLUDE_DIRS} @@ -122,7 +123,7 @@ ENDIF() SET(LIBS - dbug strings regex mysys mysys_ssl vio + dbug strings mysys mysys_ssl pcre vio ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBWRAP} ${LIBCRYPT} ${LIBDL} ${MYSQLD_STATIC_PLUGIN_LIBS} |