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

Compare commits

base: f1x1t:c9c13df5527f59c4f9eff6229152205aa296605b
Branches Tags
f1x1t:master
...
compare: f1x1t:3ff1662e6cd15c8e29dcae2c73f766231cafe477
Branches Tags
f1x1t:master

3 Commits
c9c13df552 ... 3ff1662e6c

Author SHA1 Message Date
Andrey Astafyev
3ff1662e6c Правила форматирования для qt5_translation 2020-04-10 08:50:17 +03:00
Andrey Astafyev
7cd6a6514e Форматирование кода 2020-04-10 00:59:21 +03:00
Andrey Astafyev
c62609e0dc Правка установки значений переменных 2020-04-09 22:20:55 +03:00
4 changed files with 22 additions and 20 deletions
Expand all files Collapse all files

15
.cmake-format
View File

@@ -5,13 +5,16 @@ with section("parse"):
# Specify structure for custom cmake functions # Specify structure for custom cmake functions
additional_commands = { additional_commands = {
'add_common_library': { 'flags': [], 'add_common_library': { 'flags' : [],
'kwargs': { 'OUTPUT_NAME': '*', 'kwargs': { 'OUTPUT_NAME': '*',
'SOURCES': '*', 'SOURCES': '*',
'TARGET': '*'}}, 'TARGET': '1'}},
'foo': { 'flags': ['BAR', 'BAZ'], 'qt5_translation': { 'flags' : [],
'kwargs': {'DEPENDS': '*', 'HEADERS': '*', 'SOURCES': '*'}}, 'kwargs': { 'TS_DIR': '1',
'pvs_studio_add_target': { 'flags': [ 'COMPILE_COMMANDS', 'LANGUAGES': '*',
'SOURCES': '*',
'TARGET': '1'}},
'pvs_studio_add_target': { 'flags' : [ 'COMPILE_COMMANDS',
'OUTPUT', 'OUTPUT',
'HIDE_HELP'], 'HIDE_HELP'],
'kwargs': { 'ARGS': '*', 'kwargs': { 'ARGS': '*',
@@ -20,7 +23,7 @@ with section("parse"):
'FORMAT': '*', 'FORMAT': '*',
'MODE': '*', 'MODE': '*',
'TARGET': '*'}}, 'TARGET': '*'}},
'write_compiler_detection_header': { 'flags': [], 'write_compiler_detection_header': { 'flags' : [],
'kwargs': { 'COMPILERS': '*', 'kwargs': { 'COMPILERS': '*',
'FEATURES': '*', 'FEATURES': '*',
'FILE': '*', 'FILE': '*',

12
CMLibAuxilarySymlinks.cmake
View File

@@ -5,19 +5,15 @@ if(NOT TARGET create_auxilary_symlinks)
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/files COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/files
# Ссылка на каталог с журналами # Ссылка на каталог с журналами
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/log COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/log ${CMAKE_BINARY_DIR}/files/log
${CMAKE_BINARY_DIR}/files/log
# Ссылка на каталог с обрабатываемыми данными # Ссылка на каталог с обрабатываемыми данными
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/lib COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/lib ${CMAKE_BINARY_DIR}/files/lib
${CMAKE_BINARY_DIR}/files/lib
# Ссылка на каталог с временными данными # Ссылка на каталог с временными данными
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/cache COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/cache
${CMAKE_BINARY_DIR}/files/cache ${CMAKE_BINARY_DIR}/files/cache
# Ссылка на каталог с постоянными данными # Ссылка на каталог с постоянными данными
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/data COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/data ${CMAKE_BINARY_DIR}/files/data
${CMAKE_BINARY_DIR}/files/data
# Ссылка на каталог настроек # Ссылка на каталог настроек
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/etc COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/etc ${CMAKE_BINARY_DIR}/etc)
${CMAKE_BINARY_DIR}/etc)
endif() endif()
endif() endif()

3
CMLibGlobalVariables.cmake
View File

@@ -4,6 +4,9 @@ canonical_string(${ORGANIZATION_NAME} CMLIB_ORGANIZATION_NAME_CANONICAL)
string(TOLOWER ${CMLIB_ORGANIZATION_NAME_CANONICAL} CMLIB_ORGANIZATION_NAME_LOWER) string(TOLOWER ${CMLIB_ORGANIZATION_NAME_CANONICAL} CMLIB_ORGANIZATION_NAME_LOWER)
string(TOLOWER ${CMLIB_PROJECT_NAME_CANONICAL} CMLIB_PROJECT_NAME_LOWER) string(TOLOWER ${CMLIB_PROJECT_NAME_CANONICAL} CMLIB_PROJECT_NAME_LOWER)
string(TOUPPER ${CMLIB_ORGANIZATION_NAME_CANONICAL} CMLIB_ORGANIZATION_NAME_UPPER)
string(TOUPPER ${CMLIB_PROJECT_NAME_CANONICAL} CMLIB_PROJECT_NAME_UPPER)
# CMLIB_MODULE_DIR # CMLIB_MODULE_DIR
foreach(_m ${CMAKE_MODULE_PATH}) foreach(_m ${CMAKE_MODULE_PATH})
if(EXISTS ${_m}/CMLibCommon.cmake) if(EXISTS ${_m}/CMLibCommon.cmake)

8
hpp/cmlib_private_config.hpp.in
View File

@@ -15,13 +15,13 @@
#if defined (CMLIB_ORGANIZATION_NAME_LOWER) #if defined (CMLIB_ORGANIZATION_NAME_LOWER)
#error "Duplicate definition of macros CMLIB_ORGANIZATION_NAME_LOWER" #error "Duplicate definition of macros CMLIB_ORGANIZATION_NAME_LOWER"
#else #else
#define CMLIB_ORGANIZATION_NAME_LOWER "@ORGANIZATION_NAME_LOWER@" #define CMLIB_ORGANIZATION_NAME_LOWER "@CMLIB_ORGANIZATION_NAME_LOWER@"
#endif #endif
#if defined (CMLIB_ORGANIZATION_NAME_UPPER) #if defined (CMLIB_ORGANIZATION_NAME_UPPER)
#error "Duplicate definition of macros CMLIB_ORGANIZATION_NAME_UPPER" #error "Duplicate definition of macros CMLIB_ORGANIZATION_NAME_UPPER"
#else #else
#define CMLIB_ORGANIZATION_NAME_UPPER "@ORGANIZATION_NAME_UPPER@" #define CMLIB_ORGANIZATION_NAME_UPPER "@CMLIB_ORGANIZATION_NAME_UPPER@"
#endif #endif
#if defined (CMLIB_PROJECT_NAME) #if defined (CMLIB_PROJECT_NAME)
@@ -33,13 +33,13 @@
#if defined (CMLIB_PROJECT_NAME_LOWER) #if defined (CMLIB_PROJECT_NAME_LOWER)
#error "Duplicate definition of macros CMLIB_PROJECT_NAME_LOWER" #error "Duplicate definition of macros CMLIB_PROJECT_NAME_LOWER"
#else #else
#define CMLIB_PROJECT_NAME_LOWER "@CMAKE_PROJECT_NAME_LOWER@" #define CMLIB_PROJECT_NAME_LOWER "@CMLIB_PROJECT_NAME_LOWER@"
#endif #endif
#if defined (CMLIB_PROJECT_NAME_UPPER) #if defined (CMLIB_PROJECT_NAME_UPPER)
#error "Duplicate definition of macros CMLIB_PROJECT_NAME_UPPER" #error "Duplicate definition of macros CMLIB_PROJECT_NAME_UPPER"
#else #else
#define CMLIB_PROJECT_NAME_UPPER "@CMAKE_PROJECT_NAME_UPPER@" #define CMLIB_PROJECT_NAME_UPPER "@CMLIB_PROJECT_NAME_UPPER@"
#endif #endif
#if defined (CMLIB_BUILD_TYPE) #if defined (CMLIB_BUILD_TYPE)