From 393e399ac3e9ad388983df7e05959c0833061b45 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Thu, 23 Apr 2015 14:52:49 +0300
Subject: [PATCH] Don't install config.h to /usr/include/tarantool
Include all neede variables to tarantool.h
---
CMakeLists.txt | 2 --
extra/rpm/tarantool.rpm.spec.in | 1 -
src/trivia/CMakeLists.txt | 2 +-
src/trivia/config.h.cmake | 7 +++++++
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 917c1b5cd4..25cde37ad5 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 9c39581ec3..0b883ddda1 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 b0035c2b46..4e028a3cb1 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 1f8bb5e3c4..9c4ad65964 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
--
GitLab