diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 13:58:03 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 13:58:03 +0200 |
commit | ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc (patch) | |
tree | 0d1b90c00ead9bf4e429168d00c0ccb123d1e887 /include | |
parent | 8356fb68c366b7f515f9060d964ee598653756a6 (diff) | |
parent | 56c9b0bca0576985c31f20b46dcb060a01e81a2b (diff) | |
download | mariadb-git-ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'include')
-rw-r--r-- | include/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 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() |