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 /client/CMakeLists.txt | |
| parent | 2c0a073970cf5f1dc679b34bb13e7fc55109dfd0 (diff) | |
| parent | eb2c6f451392396ef2ca74f1dba761fc4459d171 (diff) | |
| download | mariadb-git-a9240dce9e2f32941611b4f1a52e3b30a1508fc2.tar.gz | |
Merge 10.0-base -> 10.0
Diffstat (limited to 'client/CMakeLists.txt')
| -rw-r--r-- | client/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 9fed5b4ea19..7f725e09006 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -15,11 +15,12 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include + ${CMAKE_BINARY_DIR}/pcre + ${CMAKE_SOURCE_DIR}/pcre ${CMAKE_SOURCE_DIR}/mysys_ssl ${ZLIB_INCLUDE_DIR} ${SSL_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/libmysql - ${CMAKE_SOURCE_DIR}/regex ${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/strings ${MY_READLINE_INCLUDE_DIR} @@ -40,7 +41,7 @@ ENDIF(UNIX) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") -TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) +TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix) SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) |