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

Переделана структура проекта

Browse Source
This commit is contained in:
Andrei Astafev
2020-06-30 20:04:26 +03:00
parent cf52aba9a3
commit 6358fe0820
32 changed files with 315 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/base/01_endian/CMakeLists.txt → examples/core/01_endian/CMakeLists.txt
View File

@ -1,5 +1,5 @@
# Название основной цели в текущем каталоге
set(TRGT example-base-endian)
set(TRGT example-core-endian)
# Список файлов исходных текстов
set(TRGT_cpp ${CMAKE_CURRENT_SOURCE_DIR}/endian.cpp)
@ -32,9 +32,8 @@ if(MYXLIB_BUILD_EXAMPLES)
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src)
add_dependencies(${TRGT} base)
add_dependencies(${TRGT} core)
target_link_libraries(${TRGT} base_static)
target_link_libraries(${TRGT} Qt5::Core)
target_link_libraries(${TRGT} Threads::Threads)

9
examples/base/01_endian/endian.cpp → examples/core/01_endian/endian.cpp
View File

@ -1,8 +1,9 @@
#include <myx/base/config.hpp>
#include <myx/base/endian_types.hpp>
#include <myx/core/config.hpp>
#include <myx/core/endian_types.hpp>
#include <QDebug>
//NOLINTNEXTLINE
#define CMLIB_PROJECT_NAME "myxlib"
@ -12,11 +13,11 @@ int main( int argc, char** argv )
(void)argv;
beint64 bi = 1;
int64_t bii = reinterpret_cast< int64_t* >( &bi )[0];
int64_t bii = reinterpret_cast< int64_t* >( &bi )[0]; //NOLINT
qDebug() << hex << bi << bii;
leint64 li = 1;
int64_t lii = reinterpret_cast< int64_t* >( &li )[0];
int64_t lii = reinterpret_cast< int64_t* >( &li )[0]; //NOLINT
qDebug() << hex << li << lii;
return( 0 );

0
examples/base/CMakeLists.txt → examples/core/CMakeLists.txt
View File

4
examples/filesystem/01_paths/CMakeLists.txt
View File

@ -32,9 +32,9 @@ if(MYXLIB_BUILD_EXAMPLES)
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src)
add_dependencies(${TRGT} base filesystem)
add_dependencies(${TRGT} core filesystem)
target_link_libraries(${TRGT} base_static filesystem_static)
target_link_libraries(${TRGT} filesystem_static)
target_link_libraries(${TRGT} Qt5::Core)
target_link_libraries(${TRGT} Threads::Threads)

3
examples/filesystem/01_paths/paths.cpp
View File

@ -1,10 +1,11 @@
#include <myx/base/config.hpp>
#include <myx/core/config.hpp>
#include <myx/filesystem/paths.hpp>
#include <QCoreApplication>
#include <QDebug>
//NOLINTNEXTLINE
#define CMLIB_PROJECT_NAME "myxlib"
namespace MF = myx::filesystem;

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

@ -38,9 +38,9 @@ if(MYXLIB_BUILD_EXAMPLES)
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src)
add_dependencies(${TRGT} base qt)
add_dependencies(${TRGT} core qt)
target_link_libraries(${TRGT} base_static qt_static)
target_link_libraries(${TRGT} qt_static)
target_link_libraries(${TRGT} Qt5::Core)
target_link_libraries(${TRGT} Threads::Threads)

4
examples/qt/02_posix-signal-watcher/CMakeLists.txt
View File

@ -32,9 +32,9 @@ if(MYXLIB_BUILD_EXAMPLES)
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src)
add_dependencies(${TRGT} base qt)
add_dependencies(${TRGT} core qt)
target_link_libraries(${TRGT} base_static qt_static)
target_link_libraries(${TRGT} qt_static)
target_link_libraries(${TRGT} Qt5::Core)
target_link_libraries(${TRGT} Threads::Threads)

2
examples/qt/02_posix-signal-watcher/posix_signal_watcher.cpp
View File

@ -15,7 +15,7 @@ int main( int argc, char* argv[] )
sigwatch.watchForSignal( SIGTERM );
QObject::connect( &sigwatch, &MQ::PosixSignalWatcher::posixSignal, &app, &QCoreApplication::quit );
int exitcode = app.exec();
int exitcode = QCoreApplication::exec();
qDebug() << "Goodbye";
return( exitcode );
}