f1x1t/cmlib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.246060.ru:f1x1t/cmlib

Browse Source
This commit is contained in:
Andrei Astafev 2019-07-19 10:55:39 +03:00
commit 58a568b2a6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMLibConfigHPPGenerate.cmake
View File

@ -4,6 +4,6 @@ function(cmlib_config_hpp_generate)
get_property(PROJECT_VERSION_INT GLOBAL PROPERTY PROJECT_VERSION_INT) get_property(PROJECT_VERSION_INT GLOBAL PROPERTY PROJECT_VERSION_INT)
get_property(ORGANIZATION_NAME GLOBAL PROPERTY ORGANIZATION_NAME) get_property(ORGANIZATION_NAME GLOBAL PROPERTY ORGANIZATION_NAME)
configure_file(${CMLIB_MODULE_DIR}/hpp/config.hpp.in configure_file(${CMLIB_MODULE_DIR}/hpp/cmlib_config.hpp.in
${CMAKE_BINARY_DIR}/include/config.hpp) ${CMAKE_BINARY_DIR}/include/cmlib_config.hpp)
endfunction() endfunction()

6
hpp/config.hpp.in → hpp/cmlib_config.hpp.in
View File

@ -1,5 +1,5 @@
#ifndef @CMLIB_PROJECT_NAME_CANONICAL@_CONFIG_HPP_ #ifndef @CMLIB_PROJECT_NAME_CANONICAL@_CMLIB_CONFIG_HPP_
#define @CMLIB_PROJECT_NAME_CANONICAL@_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_STR "@PROJECT_VERSION@"
#define @CMLIB_PROJECT_NAME_CANONICAL@_VERSION_INT @PROJECT_VERSION_INT@ #define @CMLIB_PROJECT_NAME_CANONICAL@_VERSION_INT @PROJECT_VERSION_INT@
@ -19,5 +19,5 @@
#cmakedefine HAVE__FSEEKI64 #cmakedefine HAVE__FSEEKI64
#cmakedefine HAVE_LARGEFILES @HAVE_LARGEFILES@ #cmakedefine HAVE_LARGEFILES @HAVE_LARGEFILES@
#endif /* @CMLIB_PROJECT_NAME_CANONICAL@_CONFIG_HPP_ */ #endif /* @CMLIB_PROJECT_NAME_CANONICAL@_CMLIB_CONFIG_HPP_ */