diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-09 20:35:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-14 19:45:58 +0200 |
| commit | 3ec96c18244b448b2adf30deb856e34907c12326 (patch) | |
| tree | deb229fa478edc7c433bb5020876702bd0a2e389 /include | |
| parent | c872b10022180602fbd5b2b0310b6d1e343dff5a (diff) | |
| download | mariadb-git-3ec96c18244b448b2adf30deb856e34907c12326.tar.gz | |
MDEV-13370 Ambiguous behaviour regarding installation of header files
install all server includes under /usr/include/mysql/server/
and C/C includes under /usr/include/mysql/
Diffstat (limited to 'include')
| -rw-r--r-- | include/CMakeLists.txt | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 770a9492993..e47522a4931 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -64,18 +64,24 @@ SET(HEADERS json_lib.h ) -INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) +# don't use C/C's (possibly outdated) copy of mysqld_error.h +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h + DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) + +INSTALL(FILES ${HEADERS} + DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development) FOREACH(f ${HEADERS_GEN_CONFIGURE}) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} + DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development) ENDFOREACH(f) -INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") +INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/server/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h") STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") MACRO(INSTALL_PRIVATE DIR) INSTALL(DIRECTORY ${DIR}/. - DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development FILES_MATCHING PATTERN "*.h" PATTERN CMakeFiles EXCLUDE PATTERN mysql EXCLUDE |