diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-02 15:41:15 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-02 15:41:15 +0400 |
| commit | 1a3bb9487d9f23e895c506fd36cab1a5e39ac69b (patch) | |
| tree | 2e70e311dab03faf4cbbe32cad86493f340e547a | |
| parent | f71e253914bc698cada6002e5138a01a840550a2 (diff) | |
| download | mariadb-git-1a3bb9487d9f23e895c506fd36cab1a5e39ac69b.tar.gz | |
A follow-up for the previous commit:
MDEV-4425 Regexp enhancements
Adding ${CMAKE_BINARY_DIR}/pcre into search path for *.h files.
Needed for find pcre.h (which is generated from pcre.h.in) when
build directory != source directory.
| -rw-r--r-- | client/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/plugin.cmake | 1 | ||||
| -rw-r--r-- | libmysql/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libmysqld/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libmysqld/examples/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | plugin/feedback/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | plugin/qc_info/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | storage/perfschema/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/perfschema/unittest/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | unittest/mysys/CMakeLists.txt | 1 |
10 files changed, 14 insertions, 2 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 0321e04aa09..e27b02a6c20 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -15,6 +15,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include + ${CMAKE_BINARY_DIR}/pcre ${CMAKE_SOURCE_DIR}/pcre ${ZLIB_INCLUDE_DIR} ${SSL_INCLUDE_DIRS} diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 2bcf0342696..110a49167d3 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -54,6 +54,7 @@ MACRO(MYSQL_ADD_PLUGIN) # Add common include directories INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql + ${CMAKE_BINARY_DIR}/pcre ${CMAKE_SOURCE_DIR}/pcre ${SSL_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR}) diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index aa8e8411f8b..e2888ba25f9 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -16,6 +16,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libmysql + ${CMAKE_BINARY_DIR}/pcre ${CMAKE_SOURCE_DIR}/pcre ${CMAKE_SOURCE_DIR}/strings ${SSL_INCLUDE_DIRS} diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index b9de88cd9b6..de8f9800bab 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -22,6 +22,7 @@ ${CMAKE_SOURCE_DIR}/libmysql ${CMAKE_SOURCE_DIR}/libmysqld ${CMAKE_SOURCE_DIR}/sql ${CMAKE_BINARY_DIR}/sql +${CMAKE_BINARY_DIR}/pcre ${CMAKE_SOURCE_DIR}/pcre ${ZLIB_INCLUDE_DIR} ${SSL_INCLUDE_DIRS} diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index e74df56b1a8..cf23fdc4a6a 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -15,6 +15,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libmysqld/include + ${CMAKE_BINARY_DIR}/pcre ${CMAKE_SOURCE_DIR}/pcre ${CMAKE_SOURCE_DIR}/sql ${MY_READLINE_INCLUDE_DIR} diff --git a/plugin/feedback/CMakeLists.txt b/plugin/feedback/CMakeLists.txt index 27b0d94ce50..919324fb63b 100644 --- a/plugin/feedback/CMakeLists.txt +++ b/plugin/feedback/CMakeLists.txt @@ -1,4 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/pcre +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql + ${CMAKE_BINARY_DIR}/pcre + ${CMAKE_SOURCE_DIR}/pcre ${SSL_INCLUDE_DIRS}) SET(FEEDBACK_SOURCES feedback.cc sender_thread.cc diff --git a/plugin/qc_info/CMakeLists.txt b/plugin/qc_info/CMakeLists.txt index d26782c8a18..ca59130b072 100644 --- a/plugin/qc_info/CMakeLists.txt +++ b/plugin/qc_info/CMakeLists.txt @@ -1,4 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/pcre +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql + ${CMAKE_BINARY_DIR}/pcre + ${CMAKE_SOURCE_DIR}/pcre ${CMAKE_SOURCE_DIR}/extra/yassl/include) MYSQL_ADD_PLUGIN(QUERY_CACHE_INFO qc_info.cc) diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt index ad178a75ecf..4152853e500 100644 --- a/storage/perfschema/CMakeLists.txt +++ b/storage/perfschema/CMakeLists.txt @@ -16,6 +16,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql + ${CMAKE_BINARY_DIR}/pcre ${CMAKE_SOURCE_DIR}/pcre ${CMAKE_SOURCE_DIR}/extra/yassl/include) diff --git a/storage/perfschema/unittest/CMakeLists.txt b/storage/perfschema/unittest/CMakeLists.txt index 6a90033150b..a4881f291ef 100644 --- a/storage/perfschema/unittest/CMakeLists.txt +++ b/storage/perfschema/unittest/CMakeLists.txt @@ -16,6 +16,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/mysql + ${CMAKE_BINARY_DIR}/pcre ${CMAKE_SOURCE_DIR}/pcre ${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/extra/yassl/include diff --git a/unittest/mysys/CMakeLists.txt b/unittest/mysys/CMakeLists.txt index b9630d9a647..028bc4a9884 100644 --- a/unittest/mysys/CMakeLists.txt +++ b/unittest/mysys/CMakeLists.txt @@ -14,6 +14,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql + ${CMAKE_BINARY_DIR}/pcre ${CMAKE_SOURCE_DIR}/pcre ${CMAKE_SOURCE_DIR}/extra/yassl/include) |