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

Рефакторинг 2

Browse Source
This commit is contained in:
Andrei Astafev
2020-04-22 10:17:37 +03:00
parent 44817a8a94
commit 4e2cff180c
21 changed files with 665 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,13 +27,18 @@ add_pvs_check(${TRGT})
# Создание цели для автоматического форматирования кода
add_format_sources(${TRGT} ${TRGT_cpp})
add_dependencies(${TRGT} base_static)
add_dependencies(${TRGT} filesystem_static)
target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src)
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
target_link_libraries(${TRGT} myx-filesystem)
if(NOT MYXLIB_HEADER_ONLY)
add_dependencies(${TRGT} base_static filesystem_static)
target_link_libraries(${TRGT} myx-filesystem)
else()
target_compile_definitions(${TRGT} PUBLIC MYXLIB_HEADER_ONLY)
target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src)
add_dependencies(${TRGT} base filesystem)
endif()
target_link_libraries(${TRGT} Qt5::Core)
target_link_libraries(${TRGT} Threads::Threads)
@ -48,4 +53,4 @@ cotire(${TRGT})
add_dependencies(${TRGT} create_auxilary_symlinks)
# Правила для установки
install(TARGETS ${TRGT} COMPONENT EXAMPLES RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

6
examples/filesystem/01_minimal/minimal.cpp
View File

@ -1,5 +1,4 @@
#include "cmlib_private_config.hpp"
// #include <myx/base/cmlib_private_config.hpp>
#include <myx/base/config.hpp>
#include <myx/filesystem/paths.hpp>
@ -8,12 +7,15 @@
#include <QCoreApplication>
#include <QDebug>
#define CMLIB_PROJECT_NAME "myxlib"
namespace MF = myx::filesystem;
// Переменные для защиты экземпляра класса MF::PathsMT
std::atomic< MF::PathsMT* > MF::PathsMT::mInstance;
std::mutex MF::PathsMT::mMutex;
int main( int argc, char** argv )
{
(void)argc;

15
examples/qt/01_translators/CMakeLists.txt
View File

@ -33,14 +33,19 @@ add_pvs_check(${TRGT})
# Создание цели для автоматического форматирования кода
add_format_sources(${TRGT} ${TRGT_cpp})
add_dependencies(${TRGT} base_static)
add_dependencies(${TRGT} qt_static)
# Qt5
target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src)
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
target_link_libraries(${TRGT} myx-qt)
if(NOT MYXLIB_HEADER_ONLY)
add_dependencies(${TRGT} base_static qt_static)
target_link_libraries(${TRGT} myx-qt)
else()
target_compile_definitions(${TRGT} PUBLIC MYXLIB_HEADER_ONLY)
target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src)
add_dependencies(${TRGT} base qt)
endif()
target_link_libraries(${TRGT} Qt5::Core)
# Имя выходного файла для цели
@ -54,4 +59,4 @@ cotire(${TRGT})
add_dependencies(${TRGT} create_auxilary_symlinks)
# Правила для установки
install(TARGETS ${TRGT} COMPONENT EXAMPLES RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})