From 9af1775e332ebd911b1e8333ca65f3f3548526cc Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sat, 5 Oct 2019 16:56:59 +0300 Subject: [PATCH 01/22] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=B8=D0=BB=D1=8F=D1=86=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 14 +++++++++++--- cmake/cmlib | 2 +- doc/html/Doxyfile.in | 8 ++++---- doc/html/conf.py.in | 4 ++-- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4c2ca7..75f1a54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,10 +62,18 @@ ExternalProject_Add(whereami add_breathe_target( TARGET_NAME doc-breathe SOURCE_DIR ${CMAKE_SOURCE_DIR}/doc/html - BUILD_DIR ${CMAKE_BINARY_DIR} - CACHE_DIR ${CMAKE_BINARY_DIR}/_doctrees - HTML_DIR ${CMAKE_BINARY_DIR}/html DOXY_FILE ${CMAKE_SOURCE_DIR}/doc/html/Doxyfile.in CONF_FILE ${CMAKE_SOURCE_DIR}/doc/html/conf.py.in + CACHE_DIR ${CMAKE_BINARY_DIR}/_doctrees + BUILD_DIR ${CMAKE_BINARY_DIR}/doc/breathe + HTML_DIR ${CMAKE_BINARY_DIR}/doc/breathe COMMENT "Documentation in HTML format with Breathe generator" ) + +add_doxygen_target( + TARGET_NAME doc-doxygen + DOXY_FILE ${CMAKE_SOURCE_DIR}/doc/html/Doxyfile.in + OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/doc + HTML YES + LATEX YES + ) diff --git a/cmake/cmlib b/cmake/cmlib index 45d7f70..f630318 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 45d7f7054d8228fddc296033e09d698a01d9e0b2 +Subproject commit f630318d674b4bb0e379329f34228a4aedd98032 diff --git a/doc/html/Doxyfile.in b/doc/html/Doxyfile.in index 679470c..60291ac 100644 --- a/doc/html/Doxyfile.in +++ b/doc/html/Doxyfile.in @@ -8,7 +8,7 @@ PROJECT_NAME = @PROJECT_NAME@ PROJECT_NUMBER = PROJECT_BRIEF = PROJECT_LOGO = -OUTPUT_DIRECTORY = +OUTPUT_DIRECTORY = @OUTPUT_DIRECTORY@ CREATE_SUBDIRS = NO ALLOW_UNICODE_NAMES = NO OUTPUT_LANGUAGE = Russian @@ -193,7 +193,7 @@ IGNORE_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the HTML output #--------------------------------------------------------------------------- -GENERATE_HTML = NO +GENERATE_HTML = @GENERATE_HTML@ HTML_OUTPUT = html HTML_FILE_EXTENSION = .html HTML_HEADER = @@ -251,7 +251,7 @@ EXTRA_SEARCH_MAPPINGS = #--------------------------------------------------------------------------- # Configuration options related to the LaTeX output #--------------------------------------------------------------------------- -GENERATE_LATEX = NO +GENERATE_LATEX = @GENERATE_LATEX@ LATEX_OUTPUT = latex LATEX_CMD_NAME = latex MAKEINDEX_CMD_NAME = makeindex @@ -290,7 +290,7 @@ MAN_LINKS = NO #--------------------------------------------------------------------------- # Configuration options related to the XML output #--------------------------------------------------------------------------- -GENERATE_XML = YES +GENERATE_XML = @GENERATE_XML@ XML_OUTPUT = xml XML_PROGRAMLISTING = YES #--------------------------------------------------------------------------- diff --git a/doc/html/conf.py.in b/doc/html/conf.py.in index 4cb1b79..994bc3f 100644 --- a/doc/html/conf.py.in +++ b/doc/html/conf.py.in @@ -158,7 +158,7 @@ texinfo_documents = [ 'One line description of project.', 'Miscellaneous'), ] -breathe_projects = {'@PROJECT_NAME@': '@BREATHE_DOC_BUILD_DIR@/xml'} +breathe_projects = {'@PROJECT_NAME@': '@BREATHE_DOCS_BUILD_DIR@/xml'} def run_doxygen(folder): @@ -174,7 +174,7 @@ def run_doxygen(folder): def setup(app): - run_doxygen('@BREATHE_DOC_BUILD_DIR@') + run_doxygen('@BREATHE_DOCS_BUILD_DIR@') app.add_config_value('recommonmark_config', { 'enable_auto_toc_tree': True, 'enable_eval_rst': True, From c928416670f4603e37e5610d8bf114e2177e771a Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 7 Oct 2019 10:23:15 +0300 Subject: [PATCH 02/22] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20whereami?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- thirdparty/whereami | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/whereami b/thirdparty/whereami index 6706e7e..ea47cf6 160000 --- a/thirdparty/whereami +++ b/thirdparty/whereami @@ -1 +1 @@ -Subproject commit 6706e7e4c5bad07e2ea5abed6feb032bb1cef652 +Subproject commit ea47cf69fabe7aa84177154d9417cca5f5bd354b From 1dc5a20005b6896d4fee36c8affb96f10cfad3ff Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 7 Oct 2019 11:49:42 +0300 Subject: [PATCH 03/22] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D1=83=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/cmlib b/cmake/cmlib index f630318..fc5bbbd 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit f630318d674b4bb0e379329f34228a4aedd98032 +Subproject commit fc5bbbd4c1796fb0f88e8ce3f6c9cbdecc7579f8 From 7c4fc507e1e9d107628277d470b68829cdb6cc45 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 7 Oct 2019 12:09:43 +0300 Subject: [PATCH 04/22] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D1=83=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- thirdparty/whereami | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/whereami b/thirdparty/whereami index ea47cf6..84013d8 160000 --- a/thirdparty/whereami +++ b/thirdparty/whereami @@ -1 +1 @@ -Subproject commit ea47cf69fabe7aa84177154d9417cca5f5bd354b +Subproject commit 84013d8bcede6747b259cd7d6be962243fc54d20 From e6a65b884b4d047718cafe80e71ba325dda923e4 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 7 Oct 2019 15:14:11 +0300 Subject: [PATCH 05/22] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D1=83=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/cmlib b/cmake/cmlib index fc5bbbd..97ccbf6 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit fc5bbbd4c1796fb0f88e8ce3f6c9cbdecc7579f8 +Subproject commit 97ccbf69ac97d1116976853d57a555ec5b40ff02 From 424c669eb6177873417f5d2722863d6c7ec13123 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 7 Oct 2019 18:30:28 +0300 Subject: [PATCH 06/22] =?UTF-8?q?=D0=A4=D1=83=D0=BD=D0=BA=D1=86=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB?= =?UTF-8?q?=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B2=D0=BE=D0=B4=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 + examples/qt/01_translators/CMakeLists.txt | 48 ++++++++++++++++++ examples/qt/01_translators/translators.cpp | 19 ++++++++ examples/qt/CMakeLists.txt | 2 + l10n/example-qt-translators_ru_RU.ts | 17 +++++++ src/qt/CMakeLists.txt | 43 ++++++++++++++++ src/qt/translators.cpp | 57 ++++++++++++++++++++++ src/qt/translators.hpp | 18 +++++++ 8 files changed, 206 insertions(+) create mode 100644 examples/qt/01_translators/CMakeLists.txt create mode 100644 examples/qt/01_translators/translators.cpp create mode 100644 examples/qt/CMakeLists.txt create mode 100644 l10n/example-qt-translators_ru_RU.ts create mode 100644 src/qt/CMakeLists.txt create mode 100644 src/qt/translators.cpp create mode 100644 src/qt/translators.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 75f1a54..c75d04e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,11 +45,13 @@ include(ExternalProject) add_subdirectory(src/base) add_subdirectory(src/filesystem) add_subdirectory(src/log) +add_subdirectory(src/qt) # Примеры if (BUILD_EXAMPLES) add_subdirectory(examples/filesystem) add_subdirectory(examples/log) + add_subdirectory(examples/qt) endif() ExternalProject_Add(whereami diff --git a/examples/qt/01_translators/CMakeLists.txt b/examples/qt/01_translators/CMakeLists.txt new file mode 100644 index 0000000..84ba1f7 --- /dev/null +++ b/examples/qt/01_translators/CMakeLists.txt @@ -0,0 +1,48 @@ +# Название основной цели в текущем каталоге +set(current_target example-qt-translators) + +# Список файлов исходных текстов +set(current_target_sources + ${CMAKE_CURRENT_SOURCE_DIR}/translators.cpp + ) + +# Путь поиска библиотек внутри проекта +link_directories(${CMAKE_INSTALL_LIBDIR}) +link_directories(${CMAKE_BINARY_DIR}/src/qt/lib) + +# Цель для создания исполняемого файла +add_executable(${current_target} ${current_target_sources}) +common_target_properties(${current_target}) +add_clang_tidy_check(${current_target} ${current_target_sources}) +add_clang_analyze_check(${current_target} ${current_target_sources}) +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} qt) + +# 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_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-qt) +target_link_libraries(${current_target} Qt5::Core) + +# Имя выходного файла для цели +set_target_properties(${current_target} + PROPERTIES + OUTPUT_NAME qt-translators + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR} + ) + +add_sanitizers(${current_target}) + +# cotire(${current_target}) + +# Правила для установки +install(TARGETS ${current_target} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/examples/qt/01_translators/translators.cpp b/examples/qt/01_translators/translators.cpp new file mode 100644 index 0000000..9610b17 --- /dev/null +++ b/examples/qt/01_translators/translators.cpp @@ -0,0 +1,19 @@ +#include "qt/translators.hpp" + +#include +#include + +namespace MQ = myx::qt; + + +int main( int argc, char** argv ) +{ + QCoreApplication app( argc, argv ); + MQ::QTranslatorsList tl; + + qDebug() << QObject::tr( "Yes" ); + MQ::append_translators( tl, "example-qt-translators" ); + qDebug() << QObject::tr( "Yes" ); + + return( 0 ); +} diff --git a/examples/qt/CMakeLists.txt b/examples/qt/CMakeLists.txt new file mode 100644 index 0000000..cb905ec --- /dev/null +++ b/examples/qt/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory(01_translators) + diff --git a/l10n/example-qt-translators_ru_RU.ts b/l10n/example-qt-translators_ru_RU.ts new file mode 100644 index 0000000..a8264a7 --- /dev/null +++ b/l10n/example-qt-translators_ru_RU.ts @@ -0,0 +1,17 @@ + + + + + QObject + + + Yes + Да + + + + Cancel + Отмена + + + diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt new file mode 100644 index 0000000..db735c6 --- /dev/null +++ b/src/qt/CMakeLists.txt @@ -0,0 +1,43 @@ +# Название основной цели и имя библиотеки в текущем каталоге +set(current_target qt) + +# Список файлов исходных текстов +set(current_target_sources + ${CMAKE_CURRENT_SOURCE_DIR}/translators.cpp +) + +# Список заголовочных файлов (используется для установки) +set(current_target_headers + ${CMAKE_CURRENT_SOURCE_DIR}/translators.hpp +) + +add_common_library(TARGET ${current_target} OUTPUT_NAME myx-${current_target} + SOURCES ${current_target_sources}) +common_target_properties(${current_target}) +add_clang_tidy_check(${current_target} ${current_target_sources}) +add_clang_analyze_check(${current_target} ${current_target_sources}) +add_clazy_check(${current_target} ${current_target_sources}) +add_pvs_check(${current_target}) +add_uncrustify_format(${current_target} ${current_target_sources} ${current_target_headers}) + +target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) +target_include_directories(${current_target} SYSTEM PUBLIC ${FMT_INCLUDE_DIRS}) +target_include_directories(${current_target} SYSTEM PUBLIC ${SPDLOG_INCLUDE_DIRS}) +target_include_directories(${current_target} PRIVATE ${CMAKE_SOURCE_DIR}/src/base) + +# Цель, используемая только для установки заголовочных файлов без компиляции проекта +add_custom_target(${current_target}-install-headers + COMMAND "${CMAKE_COMMAND}" + -DCMAKE_INSTALL_COMPONENT=headers -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" + ) + +# Правила для установки +install(TARGETS ${current_target}_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +if(BUILD_SHARED_LIBS) + install(TARGETS ${current_target}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +endif() +install(FILES ${current_target_headers} + COMPONENT headers + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${current_target}) +install(FILES ${CMAKE_BINARY_DIR}/${current_target}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + diff --git a/src/qt/translators.cpp b/src/qt/translators.cpp new file mode 100644 index 0000000..a83ddfd --- /dev/null +++ b/src/qt/translators.cpp @@ -0,0 +1,57 @@ +#include "config.hpp" +#include "translators.hpp" + +#include +#include +#include + +namespace myx { + +namespace qt { + +void append_translators( QTranslatorsList& translators, const QString& appName ) +{ + auto* translator = new QTranslator( qApp ); + + if ( translator->load( QLocale(), appName, QStringLiteral( "_" ), + QStringLiteral( ":/qm" ) ) ) + { + translators.append( translator ); + } + else + { + translator->deleteLater(); + } + + translator = new QTranslator( qApp ); + if ( translator->load( QLocale::system(), + QStringLiteral( "qt" ), QStringLiteral( "_" ), + QLibraryInfo::location( QLibraryInfo::TranslationsPath ) ) ) + { + translators.append( translator ); + } + else + { + translator->deleteLater(); + } + + translator = new QTranslator( qApp ); + if ( translator->load( QStringLiteral( "qtbase_" ) + QLocale::system().name(), + QLibraryInfo::location( QLibraryInfo::TranslationsPath ) ) ) + { + translators.append( translator ); + } + else + { + translator->deleteLater(); + } + + for ( auto i : qAsConst( translators ) ) + { + qApp->installTranslator( i ); + } +} // install_translators + +} // namespace qt + +} // namespace myx diff --git a/src/qt/translators.hpp b/src/qt/translators.hpp new file mode 100644 index 0000000..9bc8738 --- /dev/null +++ b/src/qt/translators.hpp @@ -0,0 +1,18 @@ +#ifndef MYX_LOG_QT_TRANSLATORS_HPP_ +#define MYX_LOG_QT_TRANSLATORS_HPP_ + +#include + +namespace myx { + +namespace qt { + +typedef QList< QTranslator* > QTranslatorsList; + +void append_translators( QTranslatorsList& translators, const QString& appName ); + +} // namespace qt + +} // namespace myx + +#endif // ifndef MYX_LOG_QT_TRANSLATORS_HPP_ From e257c339d6b7126e143cc8c55a6f444a92c10344 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Tue, 8 Oct 2019 06:48:18 +0300 Subject: [PATCH 07/22] =?UTF-8?q?qAsConst=20=D0=B4=D0=BB=D1=8F=20Qt=20<=20?= =?UTF-8?q?5.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/config.hpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/base/config.hpp b/src/base/config.hpp index ffe9343..16ded3e 100644 --- a/src/base/config.hpp +++ b/src/base/config.hpp @@ -19,7 +19,16 @@ struct QOverload return( pmf ); } }; -#endif -#endif + +// this adds const to non-const objects (like std::as_const) +template < typename T > +Q_DECL_CONSTEXPR typename std::add_const< T >::type& qAsConst( T& t ) noexcept { return( t ); } +// prevent rvalue arguments: +template < typename T > +void qAsConst( const T&& ) = delete; + + +#endif // if QT_VERSION <= 0x050700 +#endif // if ( defined ( TARGET_LSB_ID_AstraLinuxSE ) && defined ( TARGET_LSB_CODENAME_smolensk ) ) #endif // MYX_BASE_CONFIG_HPP_ From 07110430c936faebdfde2de74ab9539b38265eaa Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Tue, 8 Oct 2019 17:07:23 +0300 Subject: [PATCH 08/22] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D1=83=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- cmake/find | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/cmlib b/cmake/cmlib index 97ccbf6..d57bbeb 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 97ccbf69ac97d1116976853d57a555ec5b40ff02 +Subproject commit d57bbeb634ff8ef93f4e2017b0787b0ee9004e55 diff --git a/cmake/find b/cmake/find index 862acd7..af57d39 160000 --- a/cmake/find +++ b/cmake/find @@ -1 +1 @@ -Subproject commit 862acd75f740e7b1b33734dcbad215c3bb5c4c37 +Subproject commit af57d3921c4d944f8475090f42b034518f7c0bc7 From 8bbf5e6c6fef00220d0de6d3ed64e3ce74039772 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Tue, 8 Oct 2019 23:58:42 +0300 Subject: [PATCH 09/22] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83=D1=80=D1=8B=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 10 +++---- examples/filesystem/01_minimal/minimal.cpp | 2 +- examples/log/01_minimal/minimal.cpp | 2 +- examples/log/02_qt/qt.cpp | 4 +-- examples/qt/01_translators/translators.cpp | 2 +- src/base/config.hpp | 34 ---------------------- src/{ => myx}/base/CMakeLists.txt | 0 src/{ => myx}/base/config.cpp | 0 src/myx/base/config.hpp | 7 +++++ src/{ => myx}/base/config_flags.hpp.in | 0 src/{ => myx}/filesystem/CMakeLists.txt | 2 +- src/{ => myx}/filesystem/paths.cpp | 2 +- src/{ => myx}/filesystem/paths.hpp | 0 src/{ => myx}/log/CMakeLists.txt | 2 +- src/{ => myx}/log/spdlog.cpp | 2 +- src/{ => myx}/log/spdlog.hpp | 0 src/{ => myx}/log/spdlog_qt.cpp | 0 src/{ => myx}/log/spdlog_qt.hpp | 0 src/{ => myx}/qt/CMakeLists.txt | 28 +++++++++--------- src/{ => myx}/qt/translators.cpp | 2 +- src/{ => myx}/qt/translators.hpp | 2 ++ 21 files changed, 38 insertions(+), 63 deletions(-) delete mode 100644 src/base/config.hpp rename src/{ => myx}/base/CMakeLists.txt (100%) rename src/{ => myx}/base/config.cpp (100%) create mode 100644 src/myx/base/config.hpp rename src/{ => myx}/base/config_flags.hpp.in (100%) rename src/{ => myx}/filesystem/CMakeLists.txt (96%) rename src/{ => myx}/filesystem/paths.cpp (99%) rename src/{ => myx}/filesystem/paths.hpp (100%) rename src/{ => myx}/log/CMakeLists.txt (96%) rename src/{ => myx}/log/spdlog.cpp (99%) rename src/{ => myx}/log/spdlog.hpp (100%) rename src/{ => myx}/log/spdlog_qt.cpp (100%) rename src/{ => myx}/log/spdlog_qt.hpp (100%) rename src/{ => myx}/qt/CMakeLists.txt (67%) rename src/{ => myx}/qt/translators.cpp (97%) rename src/{ => myx}/qt/translators.hpp (91%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c75d04e..5a56251 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,17 +35,17 @@ pkg_check_modules(SPDLOG spdlog>=1.3.1) # Автоматически генерируемый заголовочный файл cmlib_config_hpp_generate() -configure_file(${CMAKE_SOURCE_DIR}/src/base/config_flags.hpp.in +configure_file(${CMAKE_SOURCE_DIR}/src/myx/base/config_flags.hpp.in ${CMAKE_BINARY_DIR}/include/config_flags.hpp) # Подключение внешних проектов include(ExternalProject) # Библиотеки -add_subdirectory(src/base) -add_subdirectory(src/filesystem) -add_subdirectory(src/log) -add_subdirectory(src/qt) +add_subdirectory(src/myx/base) +add_subdirectory(src/myx/filesystem) +add_subdirectory(src/myx/log) +add_subdirectory(src/myx/qt) # Примеры if (BUILD_EXAMPLES) diff --git a/examples/filesystem/01_minimal/minimal.cpp b/examples/filesystem/01_minimal/minimal.cpp index 279fd9b..4e339d5 100644 --- a/examples/filesystem/01_minimal/minimal.cpp +++ b/examples/filesystem/01_minimal/minimal.cpp @@ -1,4 +1,4 @@ -#include "filesystem/paths.hpp" +#include namespace MF = myx::filesystem; diff --git a/examples/log/01_minimal/minimal.cpp b/examples/log/01_minimal/minimal.cpp index a51c557..670d8c6 100644 --- a/examples/log/01_minimal/minimal.cpp +++ b/examples/log/01_minimal/minimal.cpp @@ -1,4 +1,4 @@ -#include "log/spdlog.hpp" +#include namespace ML = myx::log; diff --git a/examples/log/02_qt/qt.cpp b/examples/log/02_qt/qt.cpp index 6ff73db..8ee0382 100644 --- a/examples/log/02_qt/qt.cpp +++ b/examples/log/02_qt/qt.cpp @@ -1,5 +1,5 @@ -#include "log/spdlog.hpp" -#include "log/spdlog_qt.hpp" +#include +#include namespace ML = myx::log; diff --git a/examples/qt/01_translators/translators.cpp b/examples/qt/01_translators/translators.cpp index 9610b17..094880b 100644 --- a/examples/qt/01_translators/translators.cpp +++ b/examples/qt/01_translators/translators.cpp @@ -1,4 +1,4 @@ -#include "qt/translators.hpp" +#include #include #include diff --git a/src/base/config.hpp b/src/base/config.hpp deleted file mode 100644 index 16ded3e..0000000 --- a/src/base/config.hpp +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef MYX_BASE_CONFIG_HPP_ -#define MYX_BASE_CONFIG_HPP_ - -#include "cmlib_config.hpp" -#include "config_flags.hpp" - -#if ( defined ( TARGET_LSB_ID_AstraLinuxSE ) && defined ( TARGET_LSB_CODENAME_smolensk ) ) - -#define override - -#if QT_VERSION <= 0x050700 -#include -template< typename ... Args > -struct QOverload -{ - template< typename C, typename R > - static constexpr auto of( R ( C::* pmf )( Args... ) )->decltype( pmf ) - { - return( pmf ); - } -}; - -// this adds const to non-const objects (like std::as_const) -template < typename T > -Q_DECL_CONSTEXPR typename std::add_const< T >::type& qAsConst( T& t ) noexcept { return( t ); } -// prevent rvalue arguments: -template < typename T > -void qAsConst( const T&& ) = delete; - - -#endif // if QT_VERSION <= 0x050700 -#endif // if ( defined ( TARGET_LSB_ID_AstraLinuxSE ) && defined ( TARGET_LSB_CODENAME_smolensk ) ) - -#endif // MYX_BASE_CONFIG_HPP_ diff --git a/src/base/CMakeLists.txt b/src/myx/base/CMakeLists.txt similarity index 100% rename from src/base/CMakeLists.txt rename to src/myx/base/CMakeLists.txt diff --git a/src/base/config.cpp b/src/myx/base/config.cpp similarity index 100% rename from src/base/config.cpp rename to src/myx/base/config.cpp diff --git a/src/myx/base/config.hpp b/src/myx/base/config.hpp new file mode 100644 index 0000000..54e0f02 --- /dev/null +++ b/src/myx/base/config.hpp @@ -0,0 +1,7 @@ +#ifndef MYX_BASE_CONFIG_HPP_ +#define MYX_BASE_CONFIG_HPP_ + +#include "cmlib_config.hpp" +#include "config_flags.hpp" + +#endif // MYX_BASE_CONFIG_HPP_ diff --git a/src/base/config_flags.hpp.in b/src/myx/base/config_flags.hpp.in similarity index 100% rename from src/base/config_flags.hpp.in rename to src/myx/base/config_flags.hpp.in diff --git a/src/filesystem/CMakeLists.txt b/src/myx/filesystem/CMakeLists.txt similarity index 96% rename from src/filesystem/CMakeLists.txt rename to src/myx/filesystem/CMakeLists.txt index 508709d..3c17ce4 100644 --- a/src/filesystem/CMakeLists.txt +++ b/src/myx/filesystem/CMakeLists.txt @@ -27,7 +27,7 @@ add_uncrustify_format(${current_target} ${current_target_sources} ${current_targ target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) target_include_directories(${current_target} SYSTEM PUBLIC ${FMT_INCLUDE_DIRS}) target_include_directories(${current_target} SYSTEM PUBLIC ${SPDLOG_INCLUDE_DIRS}) -target_include_directories(${current_target} PRIVATE ${CMAKE_SOURCE_DIR}/src/base) +target_include_directories(${current_target} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) target_include_directories(${current_target} PRIVATE ${CMAKE_BINARY_DIR}/include) # Цель, используемая только для установки заголовочных файлов без компиляции проекта diff --git a/src/filesystem/paths.cpp b/src/myx/filesystem/paths.cpp similarity index 99% rename from src/filesystem/paths.cpp rename to src/myx/filesystem/paths.cpp index 5a3b9c8..e970659 100644 --- a/src/filesystem/paths.cpp +++ b/src/myx/filesystem/paths.cpp @@ -1,5 +1,5 @@ #include "paths.hpp" -#include "config.hpp" +#include #include "whereami++.h" #include diff --git a/src/filesystem/paths.hpp b/src/myx/filesystem/paths.hpp similarity index 100% rename from src/filesystem/paths.hpp rename to src/myx/filesystem/paths.hpp diff --git a/src/log/CMakeLists.txt b/src/myx/log/CMakeLists.txt similarity index 96% rename from src/log/CMakeLists.txt rename to src/myx/log/CMakeLists.txt index f3a5a5f..1ee6509 100644 --- a/src/log/CMakeLists.txt +++ b/src/myx/log/CMakeLists.txt @@ -25,7 +25,7 @@ add_uncrustify_format(${current_target} ${current_target_sources} ${current_targ target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) target_include_directories(${current_target} SYSTEM PUBLIC ${FMT_INCLUDE_DIRS}) target_include_directories(${current_target} SYSTEM PUBLIC ${SPDLOG_INCLUDE_DIRS}) -target_include_directories(${current_target} PRIVATE ${CMAKE_SOURCE_DIR}/src/base) +target_include_directories(${current_target} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) # Цель, используемая только для установки заголовочных файлов без компиляции проекта add_custom_target(${current_target}-install-headers diff --git a/src/log/spdlog.cpp b/src/myx/log/spdlog.cpp similarity index 99% rename from src/log/spdlog.cpp rename to src/myx/log/spdlog.cpp index ae1c089..9bf99cf 100644 --- a/src/log/spdlog.cpp +++ b/src/myx/log/spdlog.cpp @@ -1,5 +1,5 @@ #include "spdlog.hpp" -#include "config.hpp" +#include namespace myx { diff --git a/src/log/spdlog.hpp b/src/myx/log/spdlog.hpp similarity index 100% rename from src/log/spdlog.hpp rename to src/myx/log/spdlog.hpp diff --git a/src/log/spdlog_qt.cpp b/src/myx/log/spdlog_qt.cpp similarity index 100% rename from src/log/spdlog_qt.cpp rename to src/myx/log/spdlog_qt.cpp diff --git a/src/log/spdlog_qt.hpp b/src/myx/log/spdlog_qt.hpp similarity index 100% rename from src/log/spdlog_qt.hpp rename to src/myx/log/spdlog_qt.hpp diff --git a/src/qt/CMakeLists.txt b/src/myx/qt/CMakeLists.txt similarity index 67% rename from src/qt/CMakeLists.txt rename to src/myx/qt/CMakeLists.txt index db735c6..0939200 100644 --- a/src/qt/CMakeLists.txt +++ b/src/myx/qt/CMakeLists.txt @@ -2,16 +2,14 @@ set(current_target qt) # Список файлов исходных текстов -set(current_target_sources - ${CMAKE_CURRENT_SOURCE_DIR}/translators.cpp -) +set(current_target_sources ${CMAKE_CURRENT_SOURCE_DIR}/translators.cpp) # Список заголовочных файлов (используется для установки) -set(current_target_headers - ${CMAKE_CURRENT_SOURCE_DIR}/translators.hpp -) +set(current_target_headers ${CMAKE_CURRENT_SOURCE_DIR}/backports.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/translators.hpp) -add_common_library(TARGET ${current_target} OUTPUT_NAME myx-${current_target} +add_common_library(TARGET ${current_target} + OUTPUT_NAME myx-${current_target} SOURCES ${current_target_sources}) common_target_properties(${current_target}) add_clang_tidy_check(${current_target} ${current_target_sources}) @@ -23,13 +21,15 @@ add_uncrustify_format(${current_target} ${current_target_sources} ${current_targ target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) target_include_directories(${current_target} SYSTEM PUBLIC ${FMT_INCLUDE_DIRS}) target_include_directories(${current_target} SYSTEM PUBLIC ${SPDLOG_INCLUDE_DIRS}) -target_include_directories(${current_target} PRIVATE ${CMAKE_SOURCE_DIR}/src/base) +target_include_directories(${current_target} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) -# Цель, используемая только для установки заголовочных файлов без компиляции проекта +# Цель, используемая только для установки заголовочных файлов без компиляции +# проекта add_custom_target(${current_target}-install-headers - COMMAND "${CMAKE_COMMAND}" - -DCMAKE_INSTALL_COMPONENT=headers -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" - ) + COMMAND "${CMAKE_COMMAND}" + -DCMAKE_INSTALL_COMPONENT=headers + -P + "${CMAKE_BINARY_DIR}/cmake_install.cmake") # Правила для установки install(TARGETS ${current_target}_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) @@ -39,5 +39,5 @@ endif() install(FILES ${current_target_headers} COMPONENT headers DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${current_target}) -install(FILES ${CMAKE_BINARY_DIR}/${current_target}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - +install(FILES ${CMAKE_BINARY_DIR}/${current_target}.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/src/qt/translators.cpp b/src/myx/qt/translators.cpp similarity index 97% rename from src/qt/translators.cpp rename to src/myx/qt/translators.cpp index a83ddfd..4b29c26 100644 --- a/src/qt/translators.cpp +++ b/src/myx/qt/translators.cpp @@ -1,4 +1,4 @@ -#include "config.hpp" +#include #include "translators.hpp" #include diff --git a/src/qt/translators.hpp b/src/myx/qt/translators.hpp similarity index 91% rename from src/qt/translators.hpp rename to src/myx/qt/translators.hpp index 9bc8738..ce9f6ed 100644 --- a/src/qt/translators.hpp +++ b/src/myx/qt/translators.hpp @@ -1,6 +1,8 @@ #ifndef MYX_LOG_QT_TRANSLATORS_HPP_ #define MYX_LOG_QT_TRANSLATORS_HPP_ +#include + #include namespace myx { From 26e43221d11f7e64e446bbe7818314f28b6b0e27 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 9 Oct 2019 00:01:50 +0300 Subject: [PATCH 10/22] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D1=8B=D0=B9=20=D1=84?= =?UTF-8?q?=D0=B0=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/myx/qt/backports.hpp | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/myx/qt/backports.hpp diff --git a/src/myx/qt/backports.hpp b/src/myx/qt/backports.hpp new file mode 100644 index 0000000..1288869 --- /dev/null +++ b/src/myx/qt/backports.hpp @@ -0,0 +1,31 @@ +#ifndef MYX_QT_BACKPORTS_HPP_ +#define MYX_QT_BACKPORTS_HPP_ + +#if ( defined ( TARGET_LSB_ID_AstraLinuxSE ) && defined ( TARGET_LSB_CODENAME_smolensk ) ) + +#define override + +#if QT_VERSION <= 0x050700 +#include +template< typename ... Args > +struct QOverload +{ + template< typename C, typename R > + static constexpr auto of( R ( C::* pmf )( Args... ) )->decltype( pmf ) + { + return( pmf ); + } +}; + +// this adds const to non-const objects (like std::as_const) +template < typename T > +Q_DECL_CONSTEXPR typename std::add_const< T >::type& qAsConst( T& t ) noexcept { return( t ); } +// prevent rvalue arguments: +template < typename T > +void qAsConst( const T&& ) = delete; + + +#endif // if QT_VERSION <= 0x050700 +#endif // if ( defined ( TARGET_LSB_ID_AstraLinuxSE ) && defined ( TARGET_LSB_CODENAME_smolensk ) ) + +#endif // MYX_QT_BACKPORTS_HPP_ From d54886620f1bf400bf2f93c5bad831969181c1d8 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 9 Oct 2019 05:35:12 +0300 Subject: [PATCH 11/22] =?UTF-8?q?=D0=92=D1=8B=D1=87=D0=B8=D1=81=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BD=D0=B0=20=D1=8D=D1=82=D0=B0?= =?UTF-8?q?=D0=BF=D0=B5=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/myx/filesystem/paths.cpp | 53 ++++++++++++++++++++++-------------- src/myx/log/spdlog.cpp | 2 +- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/src/myx/filesystem/paths.cpp b/src/myx/filesystem/paths.cpp index e970659..3133f34 100644 --- a/src/myx/filesystem/paths.cpp +++ b/src/myx/filesystem/paths.cpp @@ -1,9 +1,11 @@ #include "paths.hpp" + #include #include "whereami++.h" #include #include +#include namespace myx { @@ -57,19 +59,22 @@ void Paths::setConfigFilePath( const QFileInfo& configFilePath ) } -Paths::Paths() : - m_prefixDirectory( "/opt/" ORGANIZATION_NAME_LOWER "/" PROJECT_NAME_LOWER ), - m_binaryDirectory( m_prefixDirectory.absolutePath() + "/bin" ), - m_configDirectory( m_prefixDirectory.absolutePath() + "/etc" ), - m_cacheDirectory( m_prefixDirectory.absolutePath() + "/var" ), - m_tempDirectory( QString::fromLocal8Bit( qgetenv( qPrintable( "TMPDIR" ) ) ) ), - m_dataDirectory( m_prefixDirectory.absolutePath() + "/share" ), - m_homeDirectory( QString::fromLocal8Bit( qgetenv( qPrintable( "HOME" ) ) ) ), - m_executableFileName( PROJECT_NAME_LOWER ), - m_configFileName( PROJECT_NAME_LOWER ".conf" ), - m_executableFilePath( m_binaryDirectory.absolutePath() + "/" + m_executableFileName ), - m_configFilePath( m_binaryDirectory.absolutePath() + "/" + m_configFileName ) +Paths::Paths() { + m_prefixDirectory = "/opt/" + QCoreApplication::organizationName().toLower() + + "/" + QCoreApplication::applicationName().toLower(); + m_binaryDirectory = m_prefixDirectory.absolutePath() + "/bin"; + m_configDirectory = m_prefixDirectory.absolutePath() + "/etc"; + m_cacheDirectory = m_prefixDirectory.absolutePath() + "/var"; + m_tempDirectory = QString::fromLocal8Bit( qgetenv( qPrintable( "TMPDIR" ) ) ); + m_dataDirectory = m_prefixDirectory.absolutePath() + "/share"; + m_homeDirectory = QString::fromLocal8Bit( qgetenv( qPrintable( "HOME" ) ) ); + m_executableFileName = QCoreApplication::applicationName().toLower(); + m_configFileName = m_executableFileName + ".conf"; + m_executableFilePath = m_binaryDirectory.absolutePath() + "/" + m_executableFileName; + m_configFilePath = m_binaryDirectory.absolutePath() + "/" + m_configFileName; + + if ( m_tempDirectory.absolutePath().isEmpty() || ( m_tempDirectory.path() == "." ) ) { m_tempDirectory = _PATH_TMP; @@ -163,7 +168,8 @@ bool Paths::updatePaths() m_configDirectory = m_prefixDirectory.absolutePath() + "/etc"; m_cacheDirectory = m_prefixDirectory.absolutePath() + "/var"; m_dataDirectory = m_prefixDirectory.absolutePath() + "/share"; - m_configFilePath = QFile( m_configDirectory.absolutePath() + "/" + PROJECT_NAME_LOWER + ".conf" ); + m_configFilePath = QFile( m_configDirectory.absolutePath() + "/" + + QCoreApplication::applicationName() + ".conf" ); } if ( m_prefixDirectory.absolutePath().startsWith( "/opt" ) || @@ -172,23 +178,29 @@ bool Paths::updatePaths() QString dataDirectory = QString::fromLocal8Bit( qgetenv( qPrintable( "XDG_DATA_HOME" ) ) ); if ( dataDirectory.isEmpty() ) { - dataDirectory = m_homeDirectory.absolutePath() + ".local/share/"; + dataDirectory = m_homeDirectory.absolutePath() + ".local/share"; } - m_dataDirectory = dataDirectory + ORGANIZATION_NAME_LOWER + "/" + PROJECT_NAME_LOWER; + m_dataDirectory = dataDirectory + "/" + + QCoreApplication::organizationName().toLower() + "/" + + QCoreApplication::applicationName().toLower(); QString configDirectory = QString::fromLocal8Bit( qgetenv( qPrintable( "XDG_CONFIG_HOME" ) ) ); if ( configDirectory.isEmpty() ) { - configDirectory = m_homeDirectory.absolutePath() + ".config/"; + configDirectory = m_homeDirectory.absolutePath() + ".config"; } - m_configDirectory = configDirectory + ORGANIZATION_NAME_LOWER + "/" + PROJECT_NAME_LOWER; + m_configDirectory = configDirectory + "/" + + QCoreApplication::organizationName().toLower() + "/" + + QCoreApplication::applicationName().toLower(); QString cacheDirectory = QString::fromLocal8Bit( qgetenv( qPrintable( "XDG_CACHE_HOME" ) ) ); if ( cacheDirectory.isEmpty() ) { - cacheDirectory = m_homeDirectory.absolutePath() + ".cache/"; + cacheDirectory = m_homeDirectory.absolutePath() + ".cache"; } - m_cacheDirectory = cacheDirectory + ORGANIZATION_NAME_LOWER + "/" + PROJECT_NAME_LOWER; + m_cacheDirectory = cacheDirectory + "/" + + QCoreApplication::organizationName().toLower() + "/" + + QCoreApplication::applicationName().toLower(); } return( true ); @@ -214,7 +226,8 @@ QString Paths::findConfigFile( const QString& defaultConfigFile ) return( defaultConfigFile ); } - auto fileName = QString::fromLocal8Bit( qgetenv( qPrintable( PROJECT_NAME_UPPER "_CONFIG" ) ) ); + auto fileName = QString::fromLocal8Bit( qgetenv( QCoreApplication::applicationName() + .toUpper().toUtf8() + "_CONFIG" ) ); if ( QFileInfo( fileName ).isReadable() ) { m_configFilePath = fileName; diff --git a/src/myx/log/spdlog.cpp b/src/myx/log/spdlog.cpp index 9bf99cf..7fec3b7 100644 --- a/src/myx/log/spdlog.cpp +++ b/src/myx/log/spdlog.cpp @@ -12,7 +12,7 @@ Logger::Logger( std::string name ) : m_logger( nullptr ), m_name( std::move( name ) ), m_outputPattern( "[%H:%M:%S %z] [%n] [%^---%L---%$] %v" ), - m_baseFileName( fmt::format( "{}_{}", PROJECT_NAME, "st" ) ), + m_baseFileName( "default" ), m_maxRotatingFileSize( rotatingFileSize ), m_maxRotatingFilesCount( 3 ), m_outputLevel( spdlog::level::trace ), From fb355b8fe51b6299b717565f658fd7bf96c5e51d Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 9 Oct 2019 06:00:33 +0300 Subject: [PATCH 12/22] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=84=D1=83?= =?UTF-8?q?=D0=BD=D0=BA=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/filesystem/01_minimal/minimal.cpp | 2 +- src/myx/filesystem/paths.cpp | 2 +- src/myx/filesystem/paths.hpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/filesystem/01_minimal/minimal.cpp b/examples/filesystem/01_minimal/minimal.cpp index 4e339d5..ccbd999 100644 --- a/examples/filesystem/01_minimal/minimal.cpp +++ b/examples/filesystem/01_minimal/minimal.cpp @@ -10,7 +10,7 @@ int main( int argc, char** argv ) MF::Paths paths; paths.updatePaths(); - paths.makePaths(); + paths.makeDefaultDirectories(); paths.findConfigFile( "test" ); return( 0 ); diff --git a/src/myx/filesystem/paths.cpp b/src/myx/filesystem/paths.cpp index 3133f34..91afdf0 100644 --- a/src/myx/filesystem/paths.cpp +++ b/src/myx/filesystem/paths.cpp @@ -207,7 +207,7 @@ bool Paths::updatePaths() } // Paths::updatePaths -bool Paths::makePaths() +bool Paths::makeDefaultDirectories() { bool status = true; diff --git a/src/myx/filesystem/paths.hpp b/src/myx/filesystem/paths.hpp index 675c960..38fd721 100644 --- a/src/myx/filesystem/paths.hpp +++ b/src/myx/filesystem/paths.hpp @@ -47,7 +47,8 @@ public: void setConfigFilePath( const QFileInfo& configFilePath ); bool updatePaths(); - bool makePaths(); + bool makeDefaultDirectories(); + QString findConfigFile( const QString& defaultConfigFile = "" ); }; // class Paths From 7c4dfd5eb96e45ad6aaab797ddcaeafe2920c8b5 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 9 Oct 2019 06:01:16 +0300 Subject: [PATCH 13/22] =?UTF-8?q?=D0=9F=D1=83=D1=82=D0=B8=20=D0=BA=20?= =?UTF-8?q?=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B0?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/filesystem/01_minimal/CMakeLists.txt | 2 +- examples/log/01_minimal/CMakeLists.txt | 4 ++-- examples/log/02_qt/CMakeLists.txt | 4 ++-- examples/qt/01_translators/CMakeLists.txt | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/filesystem/01_minimal/CMakeLists.txt b/examples/filesystem/01_minimal/CMakeLists.txt index 896dbfe..e42587d 100644 --- a/examples/filesystem/01_minimal/CMakeLists.txt +++ b/examples/filesystem/01_minimal/CMakeLists.txt @@ -8,7 +8,7 @@ set(current_target_sources # Путь поиска библиотек внутри проекта link_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) -link_directories(${CMAKE_BINARY_DIR}/src/filesystem/lib) +link_directories(${CMAKE_BINARY_DIR}/src/myx/filesystem/lib) # Цель для создания исполняемого файла add_executable(${current_target} ${current_target_sources}) diff --git a/examples/log/01_minimal/CMakeLists.txt b/examples/log/01_minimal/CMakeLists.txt index 6f313d7..5ca592b 100644 --- a/examples/log/01_minimal/CMakeLists.txt +++ b/examples/log/01_minimal/CMakeLists.txt @@ -7,8 +7,8 @@ set(current_target_sources ) # Путь поиска библиотек внутри проекта -link_directories(${CMAKE_INSTALL_LIBDIR}) -link_directories(${CMAKE_BINARY_DIR}/src/log/lib) +link_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) +link_directories(${CMAKE_BINARY_DIR}/src/myx/log/lib) # Цель для создания исполняемого файла add_executable(${current_target} ${current_target_sources}) diff --git a/examples/log/02_qt/CMakeLists.txt b/examples/log/02_qt/CMakeLists.txt index 630089b..8e6d18f 100644 --- a/examples/log/02_qt/CMakeLists.txt +++ b/examples/log/02_qt/CMakeLists.txt @@ -7,8 +7,8 @@ set(current_target_sources ) # Путь поиска библиотек внутри проекта -link_directories(${CMAKE_INSTALL_LIBDIR}) -link_directories(${CMAKE_BINARY_DIR}/src/log/lib) +link_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) +link_directories(${CMAKE_BINARY_DIR}/src/myx/log/lib) # Цель для создания исполняемого файла add_executable(${current_target} ${current_target_sources}) diff --git a/examples/qt/01_translators/CMakeLists.txt b/examples/qt/01_translators/CMakeLists.txt index 84ba1f7..0e228db 100644 --- a/examples/qt/01_translators/CMakeLists.txt +++ b/examples/qt/01_translators/CMakeLists.txt @@ -7,8 +7,8 @@ set(current_target_sources ) # Путь поиска библиотек внутри проекта -link_directories(${CMAKE_INSTALL_LIBDIR}) -link_directories(${CMAKE_BINARY_DIR}/src/qt/lib) +link_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) +link_directories(${CMAKE_BINARY_DIR}/src/myx/qt/lib) # Цель для создания исполняемого файла add_executable(${current_target} ${current_target_sources}) From 0c77ff01f1a37d1048af1ede5616852ef0961ded Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 9 Oct 2019 06:07:43 +0300 Subject: [PATCH 14/22] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D1=83=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/cmlib b/cmake/cmlib index d57bbeb..f76b9c6 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit d57bbeb634ff8ef93f4e2017b0787b0ee9004e55 +Subproject commit f76b9c675848cf6f1f5a8e42a203a7d15b2c37ba From 0af15f6b606c6a8e000da0cc28c9563d65a1be42 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 9 Oct 2019 09:50:38 +0300 Subject: [PATCH 15/22] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D1=83=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/cmlib b/cmake/cmlib index f76b9c6..f0760fc 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit f76b9c675848cf6f1f5a8e42a203a7d15b2c37ba +Subproject commit f0760fcd1176d42cc53dd1e57520144ef25d3ec8 From 5998a1e2e69117e644debbe3396175b05e5c0bd1 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 9 Oct 2019 11:58:00 +0300 Subject: [PATCH 16/22] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D1=83=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/cmlib b/cmake/cmlib index f0760fc..bf09929 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit f0760fcd1176d42cc53dd1e57520144ef25d3ec8 +Subproject commit bf099295ab3e448c420cc3b17c0a436e9d990884 From d17cf88ae99edcfc08d89597c3247b7740d9a396 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 9 Oct 2019 17:12:38 +0300 Subject: [PATCH 17/22] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D1=83=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- cmake/etc/cpack_ignore.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/cmlib b/cmake/cmlib index bf09929..e57792f 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit bf099295ab3e448c420cc3b17c0a436e9d990884 +Subproject commit e57792f316e0383d4238f030aaebaad0f84161aa diff --git a/cmake/etc/cpack_ignore.txt b/cmake/etc/cpack_ignore.txt index 41b99a3..c350360 100644 --- a/cmake/etc/cpack_ignore.txt +++ b/cmake/etc/cpack_ignore.txt @@ -1,4 +1,3 @@ -.pc/ .git/ obj.*/ build From 26ac40a8b5d65ac6bfd0fcf53909017e8404cd79 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 9 Oct 2019 17:18:06 +0300 Subject: [PATCH 18/22] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D1=83=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/cmlib b/cmake/cmlib index e57792f..0a2d9a4 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit e57792f316e0383d4238f030aaebaad0f84161aa +Subproject commit 0a2d9a4fceb445843be62247f77da098faf7ba12 From 9e9b2b40f7f1b6e6345dc9a418cd3031d1ff0478 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sun, 13 Oct 2019 09:29:02 +0300 Subject: [PATCH 19/22] =?UTF-8?q?=D0=94=D0=BE=D0=BA=D1=83=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 19 +----------------- cmake/cmlib | 2 +- doc/CMakeLists.txt | 20 +++++++++++++++++++ doc/{html => }/Doxyfile.in | 6 +++--- .../code-reference/classes-and-functions.md | 0 doc/{html => breathe}/conf.py.in | 0 doc/{html => breathe}/index.md | 0 7 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 doc/CMakeLists.txt rename doc/{html => }/Doxyfile.in (99%) rename doc/{html => breathe}/code-reference/classes-and-functions.md (100%) rename doc/{html => breathe}/conf.py.in (100%) rename doc/{html => breathe}/index.md (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a56251..46886f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,6 +46,7 @@ add_subdirectory(src/myx/base) add_subdirectory(src/myx/filesystem) add_subdirectory(src/myx/log) add_subdirectory(src/myx/qt) +add_subdirectory(doc) # Примеры if (BUILD_EXAMPLES) @@ -61,21 +62,3 @@ ExternalProject_Add(whereami CONFIGURE_COMMAND ${CMAKE_COMMAND} -"G${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DBUILD_SHARED_LIBS=OFF -DBUILD_EXAMPLES=OFF ) -add_breathe_target( - TARGET_NAME doc-breathe - SOURCE_DIR ${CMAKE_SOURCE_DIR}/doc/html - DOXY_FILE ${CMAKE_SOURCE_DIR}/doc/html/Doxyfile.in - CONF_FILE ${CMAKE_SOURCE_DIR}/doc/html/conf.py.in - CACHE_DIR ${CMAKE_BINARY_DIR}/_doctrees - BUILD_DIR ${CMAKE_BINARY_DIR}/doc/breathe - HTML_DIR ${CMAKE_BINARY_DIR}/doc/breathe - COMMENT "Documentation in HTML format with Breathe generator" - ) - -add_doxygen_target( - TARGET_NAME doc-doxygen - DOXY_FILE ${CMAKE_SOURCE_DIR}/doc/html/Doxyfile.in - OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/doc - HTML YES - LATEX YES - ) diff --git a/cmake/cmlib b/cmake/cmlib index 0a2d9a4..156d74f 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 0a2d9a4fceb445843be62247f77da098faf7ba12 +Subproject commit 156d74f581cac0771f3c05411fd0d79f811afc55 diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 0000000..79789f3 --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1,20 @@ +add_breathe_target( + TARGET_NAME doc-breathe + SOURCE_DIR ${CMAKE_SOURCE_DIR}/doc/breathe + DOXY_FILE ${CMAKE_SOURCE_DIR}/doc/Doxyfile.in + CONF_FILE ${CMAKE_SOURCE_DIR}/doc/breathe/conf.py.in + OUTPUT_DIR ${CMAKE_BINARY_DIR}/doc/breathe + COMMENT "Documentation in HTML format with Breathe generator" + ) + +add_doxygen_target( + TARGET_NAME doc-doxygen + SOURCE_DIR ${CMAKE_SOURCE_DIR}/src + DOXY_FILE ${CMAKE_SOURCE_DIR}/doc/Doxyfile.in + OUTPUT_DIR ${CMAKE_BINARY_DIR}/doc + HTML YES + LATEX YES + COMMENT "Documentation in HTML and LaTeX format with Doxygen" + ) + + diff --git a/doc/html/Doxyfile.in b/doc/Doxyfile.in similarity index 99% rename from doc/html/Doxyfile.in rename to doc/Doxyfile.in index 60291ac..ef33a14 100644 --- a/doc/html/Doxyfile.in +++ b/doc/Doxyfile.in @@ -11,7 +11,7 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = @OUTPUT_DIRECTORY@ CREATE_SUBDIRS = NO ALLOW_UNICODE_NAMES = NO -OUTPUT_LANGUAGE = Russian +OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = "The $name class" \ @@ -28,8 +28,8 @@ ABBREVIATE_BRIEF = "The $name class" \ ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO FULL_PATH_NAMES = YES -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = +STRIP_FROM_PATH = @CMAKE_SOURCE_DIR@/src +STRIP_FROM_INC_PATH = @CMAKE_SOURCE_DIR@/src SHORT_NAMES = NO JAVADOC_AUTOBRIEF = NO QT_AUTOBRIEF = NO diff --git a/doc/html/code-reference/classes-and-functions.md b/doc/breathe/code-reference/classes-and-functions.md similarity index 100% rename from doc/html/code-reference/classes-and-functions.md rename to doc/breathe/code-reference/classes-and-functions.md diff --git a/doc/html/conf.py.in b/doc/breathe/conf.py.in similarity index 100% rename from doc/html/conf.py.in rename to doc/breathe/conf.py.in diff --git a/doc/html/index.md b/doc/breathe/index.md similarity index 100% rename from doc/html/index.md rename to doc/breathe/index.md From e327057bbbbf7a92b32d0ced70b8d51dca348975 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 16 Oct 2019 19:13:52 +0300 Subject: [PATCH 20/22] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80?= =?UTF-8?q?=D0=B6=D0=BA=D0=B0=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B2=20CMLib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- cmake/etc/Variables.cmake | 21 +++++++++++++++++++++ cmake/etc/cpack_ignore.txt | 13 ------------- cmake/etc/organization.txt | 1 - 4 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 cmake/etc/Variables.cmake delete mode 100644 cmake/etc/cpack_ignore.txt delete mode 100644 cmake/etc/organization.txt diff --git a/cmake/cmlib b/cmake/cmlib index 156d74f..aa267e4 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 156d74f581cac0771f3c05411fd0d79f811afc55 +Subproject commit aa267e4bfccc457525adc8b28b296b82339bc722 diff --git a/cmake/etc/Variables.cmake b/cmake/etc/Variables.cmake new file mode 100644 index 0000000..6085d4f --- /dev/null +++ b/cmake/etc/Variables.cmake @@ -0,0 +1,21 @@ +set(ORGANIZATION_NAME "rtis") + +set(CPACK_GENERATOR "TXZ;DEB") +set(CPACK_PACKAGE_CONTACT "Andrei Astafev ") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MyX library") +set(CPACK_DEBIAN_PACKAGE_SECTION "misc") +set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional") +set(CPACK_SOURCE_IGNORE_FILES + .git/ + obj.*/ + build + files/var + debian/tmp/ + debian/files + debian/.*\\\\.log$ + debian/.*.substvars + debian/stamp.* + CMakeLists.txt.user + cmake/lib/.git$ + ~$ + \\\\..*\\\\.swp$) diff --git a/cmake/etc/cpack_ignore.txt b/cmake/etc/cpack_ignore.txt deleted file mode 100644 index c350360..0000000 --- a/cmake/etc/cpack_ignore.txt +++ /dev/null @@ -1,13 +0,0 @@ -.git/ -obj.*/ -build -files/var -debian/tmp/ -debian/files -debian/.*\\\\.log$ -debian/.*.substvars -debian/stamp.* -CMakeLists.txt.user -cmake/lib/.git$ -~$ -\\\\..*\\\\.swp$ diff --git a/cmake/etc/organization.txt b/cmake/etc/organization.txt deleted file mode 100644 index 8953648..0000000 --- a/cmake/etc/organization.txt +++ /dev/null @@ -1 +0,0 @@ -RTIS From 77bff0856c9228c7c01ada3d85da153e72d069f5 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 16 Oct 2019 19:14:50 +0300 Subject: [PATCH 21/22] =?UTF-8?q?=D0=93=D0=B5=D0=BD=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BD=D0=B0=20=D1=80=D1=83?= =?UTF-8?q?=D1=81=D1=81=D0=BA=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index ef33a14..b660ab4 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -11,7 +11,7 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = @OUTPUT_DIRECTORY@ CREATE_SUBDIRS = NO ALLOW_UNICODE_NAMES = NO -OUTPUT_LANGUAGE = English +OUTPUT_LANGUAGE = Russian BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = "The $name class" \ From befef7b0845250d6dc773a83f45a12c29d781554 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 16 Oct 2019 19:21:28 +0300 Subject: [PATCH 22/22] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D1=83=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/cmlib b/cmake/cmlib index aa267e4..cd3afd2 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit aa267e4bfccc457525adc8b28b296b82339bc722 +Subproject commit cd3afd21c8b46a02fc2a43eb0537686eacca2361