diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-04 01:22:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-04 01:22:53 +0100 |
| commit | 016bd4fc5fff311dc4091b3b7329cd980dbaa14b (patch) | |
| tree | 4d208f3494087c6bc289a911336580e3d6d91e34 /storage | |
| parent | 8705d00ab62b4d3f749b4b8cba07718e8fd54bcb (diff) | |
| download | mariadb-git-016bd4fc5fff311dc4091b3b7329cd980dbaa14b.tar.gz | |
MDEV-5620 CMake option to compile against an external PCRE library
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/perfschema/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | storage/perfschema/unittest/CMakeLists.txt | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt index 422d29464ae..718baa8296b 100644 --- a/storage/perfschema/CMakeLists.txt +++ b/storage/perfschema/CMakeLists.txt @@ -16,8 +16,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql - ${CMAKE_BINARY_DIR}/pcre - ${CMAKE_SOURCE_DIR}/pcre + ${PCRE_INCLUDES} ${CMAKE_SOURCE_DIR}/extra/yassl/include) ADD_DEFINITIONS(-DMYSQL_SERVER) diff --git a/storage/perfschema/unittest/CMakeLists.txt b/storage/perfschema/unittest/CMakeLists.txt index d42d448d1e9..b44d0173029 100644 --- a/storage/perfschema/unittest/CMakeLists.txt +++ b/storage/perfschema/unittest/CMakeLists.txt @@ -15,8 +15,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/mysql - ${CMAKE_BINARY_DIR}/pcre - ${CMAKE_SOURCE_DIR}/pcre + ${PCRE_INCLUDES} ${CMAKE_SOURCE_DIR}/sql ${SSL_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/unittest/mytap |