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.
12 years ago · 1a3bb9487d
10 changed files with 14 additions and 2 deletions
--- 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}
--- 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})
--- 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}
--- 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}
--- 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}
--- 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
--- 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)
--- 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)

--- 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
--- 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)