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

Merge branch 'master' of gitlab.2:f1x1t/myxlib

Browse Source
This commit is contained in:
Andrei Astafev
2019-10-19 06:47:55 +03:00
parent 45fb667829 befef7b084
commit bba3eff05a
28 changed files with 302 additions and 66 deletions

2
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})

4
examples/filesystem/01_minimal/minimal.cpp

@ -1,4 +1,4 @@
#include "filesystem/paths.hpp"
#include <myx/filesystem/paths.hpp>
namespace MF = myx::filesystem;
@ -10,7 +10,7 @@ int main( int argc, char** argv )
MF::Paths paths;
paths.updatePaths();
paths.makePaths();
paths.makeDefaultDirectories();
paths.findConfigFile( "test" );
return( 0 );

4
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})

2
examples/log/01_minimal/minimal.cpp

@ -1,4 +1,4 @@
#include "log/spdlog.hpp"
#include <myx/log/spdlog.hpp>
namespace ML = myx::log;

4
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})

4
examples/log/02_qt/qt.cpp

@ -1,5 +1,5 @@
#include "log/spdlog.hpp"
#include "log/spdlog_qt.hpp"
#include <myx/log/spdlog.hpp>
#include <myx/log/spdlog_qt.hpp>
namespace ML = myx::log;

48
examples/qt/01_translators/CMakeLists.txt Normal file

@ -0,0 +1,48 @@
# Название основной цели в текущем каталоге
set(current_target example-qt-translators)
# Список файлов исходных текстов
set(current_target_sources
${CMAKE_CURRENT_SOURCE_DIR}/translators.cpp
)
# Путь поиска библиотек внутри проекта
link_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
link_directories(${CMAKE_BINARY_DIR}/src/myx/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})

19
examples/qt/01_translators/translators.cpp Normal file

@ -0,0 +1,19 @@
#include <myx/qt/translators.hpp>
#include <QCoreApplication>
#include <QDebug>
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 );
}

2
examples/qt/CMakeLists.txt Normal file

@ -0,0 +1,2 @@
add_subdirectory(01_translators)