diff --git a/CMakeLists.txt b/CMakeLists.txt index 917c1b5cd4b8e7a0d8da3ff6639bdc8bdfb0c831..25cde37ad55b7c8cb6d009d631275efa6d3c55bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -364,8 +364,6 @@ configure_file( "${PROJECT_SOURCE_DIR}/src/trivia/config.h.cmake" "${PROJECT_BINARY_DIR}/src/trivia/config.h" ) -install(FILES ${PROJECT_BINARY_DIR}/src/trivia/config.h - DESTINATION ${MODULE_INCLUDEDIR}) message (STATUS "") message (STATUS "Tarantool configuration is complete:") message (STATUS "") diff --git a/extra/rpm/tarantool.rpm.spec.in b/extra/rpm/tarantool.rpm.spec.in index 9c39581ec32470da9b6af656c79509745335f339..0b883ddda1cec7bc8113abde40b04b54fc853a5e 100644 --- a/extra/rpm/tarantool.rpm.spec.in +++ b/extra/rpm/tarantool.rpm.spec.in @@ -293,7 +293,6 @@ chkconfig --del tarantool %files dev %defattr(-,root,root,-) %dir "%{_includedir}/tarantool" -"%{_includedir}/tarantool/config.h" "%{_includedir}/tarantool/lauxlib.h" "%{_includedir}/tarantool/luaconf.h" "%{_includedir}/tarantool/lua.h" diff --git a/src/trivia/CMakeLists.txt b/src/trivia/CMakeLists.txt index b0035c2b461aa3f16c7833a671371bc7585cc840..4e028a3cb11e4b80a79548b81d7efd8f4a45025b 100644 --- a/src/trivia/CMakeLists.txt +++ b/src/trivia/CMakeLists.txt @@ -1,2 +1,2 @@ -set(api_headers ../say.h ../coeio.h ../lua/utils.h) +set(api_headers config.h ../say.h ../coeio.h ../lua/utils.h) apigen(${api_headers}) diff --git a/src/trivia/config.h.cmake b/src/trivia/config.h.cmake index 1f8bb5e3c44b2f4ef04db587c2e016264ead8107..9c4ad6596417a15fb5865d55a234e173f8ddad97 100644 --- a/src/trivia/config.h.cmake +++ b/src/trivia/config.h.cmake @@ -4,6 +4,7 @@ * This file is generated by CMake. The original file is called * config.h.cmake. Please do not modify. */ +/** \cond public */ /* * A string with major-minor-patch-commit-id identifier of the * release. @@ -13,6 +14,8 @@ #define PACKAGE_VERSION_MINOR @CPACK_PACKAGE_VERSION_MINOR@ #define PACKAGE_VERSION_PATCH @CPACK_PACKAGE_VERSION_PATCH@ +/** \endcond public */ + #define PACKAGE "@PACKAGE@" /* Defined if building for Linux */ #cmakedefine TARGET_OS_LINUX 1 @@ -146,6 +149,8 @@ #cmakedefine HAVE_UUIDGEN 1 +/** \cond public */ + /* * predefined /etc directory prefix. */ @@ -167,6 +172,8 @@ #define MODULE_LUAPATH "@MODULE_LUAPATH@" #define MODULE_LIBPATH "@MODULE_LIBPATH@" +/** \endcond public */ + #define DEFAULT_CFG_FILENAME "tarantool.cfg" #define DEFAULT_CFG SYSCONF_DIR "/" DEFAULT_CFG_FILENAME