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

Compare commits

base: f1x1t:aba632a1d7d673fb17c85284327b123061f04bc0
Branches Tags
f1x1t:master
...
compare: f1x1t:d28f78d52115566a8a2be22a77be44f928d8e621
Branches Tags
f1x1t:master

4 Commits
aba632a1d7 ... d28f78d521

Author SHA1 Message Date
Andrey Astafyev
d28f78d521 Название проекта и организации в верхнем регистре 2019-10-04 12:35:35 +03:00
Andrey Astafyev
cceec65fe3 Merge branch 'master' of gitlab.2:/f1x1t/cmlib 2019-10-04 11:26:25 +03:00
Andrey Astafyev
6081722268 Название проекта и организации в нижнем регистре 2019-10-04 11:25:56 +03:00
Andrey Astafyev
6aa56df011 Генерируемые файлы исключены из проверки 2019-10-04 06:57:28 +03:00
3 changed files with 10 additions and 1 deletions
Expand all files Collapse all files

3
CMLibCodeAnalysisPvsStudio.cmake
View File

@@ -14,7 +14,8 @@ function(add_pvs_check)
HIDE_HELP HIDE_HELP
OUTPUT FORMAT errorfile OUTPUT FORMAT errorfile
CONFIG "${CMAKE_BINARY_DIR}/PVS-Studio-${_target}.cfg" CONFIG "${CMAKE_BINARY_DIR}/PVS-Studio-${_target}.cfg"
CFG_TEXT "analysis-mode=29" ARGS --analysis-mode 29
--exclude-path ${CMAKE_CURRENT_BINARY_DIR}/${_target}_autogen
MODE GA:1,2,3;64:1;OP:1,2;CS:1,2) MODE GA:1,2,3;64:1;OP:1,2;CS:1,2)
add_dependencies(pvs-check pvs-check-${_target}) add_dependencies(pvs-check pvs-check-${_target})
else() else()

4
CMLibConfigHPPGenerate.cmake
View File

@@ -4,6 +4,10 @@ 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)
string(TOLOWER ${ORGANIZATION_NAME} ORGANIZATION_NAME_LOWER)
string(TOUPPER ${ORGANIZATION_NAME} ORGANIZATION_NAME_UPPER)
string(TOLOWER ${CMAKE_PROJECT_NAME} CMAKE_PROJECT_NAME_LOWER)
string(TOUPPER ${CMAKE_PROJECT_NAME} CMAKE_PROJECT_NAME_UPPER)
configure_file(${CMLIB_MODULE_DIR}/hpp/cmlib_config.hpp.in configure_file(${CMLIB_MODULE_DIR}/hpp/cmlib_config.hpp.in
${CMAKE_BINARY_DIR}/include/cmlib_config.hpp) ${CMAKE_BINARY_DIR}/include/cmlib_config.hpp)
endfunction() endfunction()

4
hpp/cmlib_config.hpp.in
View File

@@ -4,7 +4,11 @@
#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@
#define ORGANIZATION_NAME "@ORGANIZATION_NAME@" #define ORGANIZATION_NAME "@ORGANIZATION_NAME@"
#define ORGANIZATION_NAME_LOWER "@ORGANIZATION_NAME_LOWER@"
#define ORGANIZATION_NAME_UPPER "@ORGANIZATION_NAME_UPPER@"
#define PROJECT_NAME "@CMAKE_PROJECT_NAME@" #define PROJECT_NAME "@CMAKE_PROJECT_NAME@"
#define PROJECT_NAME_LOWER "@CMAKE_PROJECT_NAME_LOWER@"
#define PROJECT_NAME_UPPER "@CMAKE_PROJECT_NAME_UPPER@"
#define BUILD_TYPE "@CMAKE_BUILD_TYPE@" #define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
#define BUILD_DATE "@TODAY@" #define BUILD_DATE "@TODAY@"
#cmakedefine PROFILE @PROFILE@ #cmakedefine PROFILE @PROFILE@