From 1fdbd267dd745064331460ea7d59be6180a4ddca Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Tue, 16 Jul 2019 08:31:35 +0300 Subject: [PATCH] =?UTF-8?q?config.hpp=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=B2=20cmlib=5Fc?= =?UTF-8?q?onfig.hpp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibConfigHPPGenerate.cmake | 4 ++-- hpp/{config.hpp.in => cmlib_config.hpp.in} | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename hpp/{config.hpp.in => cmlib_config.hpp.in} (78%) diff --git a/CMLibConfigHPPGenerate.cmake b/CMLibConfigHPPGenerate.cmake index 06f9ac5..939c903 100644 --- a/CMLibConfigHPPGenerate.cmake +++ b/CMLibConfigHPPGenerate.cmake @@ -4,6 +4,6 @@ function(cmlib_config_hpp_generate) get_property(PROJECT_VERSION_INT GLOBAL PROPERTY PROJECT_VERSION_INT) get_property(ORGANIZATION_NAME GLOBAL PROPERTY ORGANIZATION_NAME) - configure_file(${CMLIB_MODULE_DIR}/hpp/config.hpp.in - ${CMAKE_BINARY_DIR}/include/config.hpp) + configure_file(${CMLIB_MODULE_DIR}/hpp/cmlib_config.hpp.in + ${CMAKE_BINARY_DIR}/include/cmlib_config.hpp) endfunction() diff --git a/hpp/config.hpp.in b/hpp/cmlib_config.hpp.in similarity index 78% rename from hpp/config.hpp.in rename to hpp/cmlib_config.hpp.in index 4bb9693..c256ebb 100644 --- a/hpp/config.hpp.in +++ b/hpp/cmlib_config.hpp.in @@ -1,5 +1,5 @@ -#ifndef @CMLIB_PROJECT_NAME_CANONICAL@_CONFIG_HPP_ -#define @CMLIB_PROJECT_NAME_CANONICAL@_CONFIG_HPP_ +#ifndef @CMLIB_PROJECT_NAME_CANONICAL@_CMLIB_CONFIG_HPP_ +#define @CMLIB_PROJECT_NAME_CANONICAL@_CMLIB_CONFIG_HPP_ #define @CMLIB_PROJECT_NAME_CANONICAL@_VERSION_STR "@PROJECT_VERSION@" #define @CMLIB_PROJECT_NAME_CANONICAL@_VERSION_INT @PROJECT_VERSION_INT@ @@ -19,5 +19,5 @@ #cmakedefine HAVE__FSEEKI64 #cmakedefine HAVE_LARGEFILES @HAVE_LARGEFILES@ -#endif /* @CMLIB_PROJECT_NAME_CANONICAL@_CONFIG_HPP_ */ +#endif /* @CMLIB_PROJECT_NAME_CANONICAL@_CMLIB_CONFIG_HPP_ */