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

Чистка кода

Browse Source
This commit is contained in:
Andrei Astafev
2019-10-04 15:33:49 +03:00
parent aaad6c2d60
commit ee11f4b875
11 changed files with 91 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/filesystem/01_minimal/CMakeLists.txt
View File

@ -19,6 +19,9 @@ add_clazy_check(${current_target} ${current_target_sources})
add_uncrustify_format(${current_target} ${current_target_sources})
add_pvs_check(${current_target})
add_dependencies(${current_target} base)
add_dependencies(${current_target} filesystem)
# Qt5
# qt_translation(TARGET ${current_target} TS_DIR ${CMAKE_SOURCE_DIR}/l10n LANGUAGES ru_RU)
target_include_directories(${current_target} PRIVATE ${CMAKE_SOURCE_DIR}/src)
@ -27,7 +30,7 @@ target_include_directories(${current_target} SYSTEM PUBLIC ${SPDLOG_INCLUDE_DIRS
target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
target_compile_options(${current_target} PUBLIC "${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
target_link_libraries(${current_target} myx-filesystem_static)
target_link_libraries(${current_target} myx-filesystem)
target_link_libraries(${current_target} Qt5::Core)
# Имя выходного файла для цели

5
examples/log/01_minimal/CMakeLists.txt
View File

@ -19,13 +19,16 @@ add_clazy_check(${current_target} ${current_target_sources})
add_uncrustify_format(${current_target} ${current_target_sources})
add_pvs_check(${current_target})
add_dependencies(${current_target} base)
add_dependencies(${current_target} log)
# Qt5
# qt_translation(TARGET ${current_target} TS_DIR ${CMAKE_SOURCE_DIR}/l10n LANGUAGES ru_RU)
target_include_directories(${current_target} PRIVATE ${CMAKE_SOURCE_DIR}/src)
target_include_directories(${current_target} SYSTEM PUBLIC ${FMT_INCLUDE_DIRS})
target_include_directories(${current_target} SYSTEM PUBLIC ${SPDLOG_INCLUDE_DIRS})
target_link_libraries(${current_target} myx-log_static)
target_link_libraries(${current_target} myx-log)
# Имя выходного файла для цели
set_target_properties(${current_target}

16
examples/log/01_minimal/minimal.cpp
View File

@ -5,17 +5,19 @@ namespace ML = myx::log;
int main( int argc, char** argv )
{
ML::defaultLogger.enableStdoutSink();
(void)argc;
(void)argv;
ML::default_logger.enableStdoutSink();
spdlog::register_logger( ML::defaultLogger.logger() );
spdlog::set_default_logger( ML::defaultLogger.logger() );
spdlog::register_logger( ML::default_logger.logger() );
spdlog::set_default_logger( ML::default_logger.logger() );
ML::info( "aaaa" );
ML::trace( "bbbb" );
ML::info( "info" );
ML::trace( "trace" );
spdlog::set_pattern( "[%H:%M:%S %z] %v" );
ML::info( "aaaa 111" );
ML::trace( "bbbb 111" );
ML::info( "new info" );
ML::trace( "new trace" );
return( 0 );
}

5
examples/log/02_qt/CMakeLists.txt
View File

@ -19,6 +19,9 @@ add_clazy_check(${current_target} ${current_target_sources})
add_uncrustify_format(${current_target} ${current_target_sources})
add_pvs_check(${current_target})
add_dependencies(${current_target} base)
add_dependencies(${current_target} log)
# Qt5
# qt_translation(TARGET ${current_target} TS_DIR ${CMAKE_SOURCE_DIR}/l10n LANGUAGES ru_RU)
target_include_directories(${current_target} PRIVATE ${CMAKE_SOURCE_DIR}/src)
@ -27,7 +30,7 @@ target_include_directories(${current_target} SYSTEM PUBLIC ${SPDLOG_INCLUDE_DIRS
target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
target_compile_options(${current_target} PUBLIC "${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
target_link_libraries(${current_target} myx-log_static)
target_link_libraries(${current_target} myx-log)
target_link_libraries(${current_target} Qt5::Core)
# Имя выходного файла для цели

16
examples/log/02_qt/qt.cpp
View File

@ -6,19 +6,21 @@ namespace ML = myx::log;
int main( int argc, char** argv )
{
ML::defaultLogger.enableStdoutSink();
(void)argc;
(void)argv;
ML::default_logger.enableStdoutSink();
spdlog::register_logger( ML::defaultLogger.logger() );
spdlog::set_default_logger( ML::defaultLogger.logger() );
spdlog::register_logger( ML::default_logger.logger() );
spdlog::set_default_logger( ML::default_logger.logger() );
qInstallMessageHandler( ML::spdlog_qt_message_handler );
qInfo() << "aaaa";
qDebug() << "bbbb";
qInfo() << "info";
qDebug() << "debug";
spdlog::set_pattern( "[%H:%M:%S %z] %v" );
qInfo( "aaaa 111" );
qDebug( "bbbb 111" );
qInfo( "new info" );
qDebug( "new debug" );
return( 0 );
}