diff options
| author | Daniel Black <daniel@mariadb.org> | 2023-01-06 09:08:43 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2023-01-06 11:07:11 +1100 |
| commit | cad33ded19e45a0187754b2ad03c4c634405aa46 (patch) | |
| tree | 89875a8c086a6a84e3e0e0afdfa9418094b3943e | |
| parent | d0a534d293edbb1d5345616e3052c0f9b94260a8 (diff) | |
| download | mariadb-git-cad33ded19e45a0187754b2ad03c4c634405aa46.tar.gz | |
MDEV-30344: Without wsrep needs wsrep{,_on}.h headers
In the Develop package because of their use from sql_class.h
which is the main file for THD needed by server plugins.
| -rw-r--r-- | include/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sql/CMakeLists.txt | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index e094a7b7a0c..1024821e569 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -77,7 +77,6 @@ FOREACH(f ${HEADERS_GEN_CONFIGURE}) ENDFOREACH(f) IF(NOT WITH_WSREP) SET(EXCL_SERVICE_WSREP "service_wsrep.h") - SET(EXCL_WSREP "wsrep.h") ENDIF() INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/server/mysql COMPONENT Development @@ -94,7 +93,6 @@ MACRO(INSTALL_PRIVATE DIR) FILES_MATCHING PATTERN "*.h" PATTERN CMakeFiles EXCLUDE PATTERN mysql EXCLUDE - PATTERN "${EXCL_WSREP}" EXCLUDE REGEX "\\./(${EXCL_RE}$)" EXCLUDE) ENDMACRO() diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 583fe11b38b..18054252584 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -496,7 +496,7 @@ IF(WIN32) ENDIF(WIN32) IF(NOT WITH_WSREP) - SET(EXCL_WSREP "wsrep*.h") + SET(EXCL_WSREP "wsrep_[a-np-z]*.h") ENDIF() INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development FILES_MATCHING PATTERN "*.h" |