From 407d073f2364fcf0766e11818a8a9affad259dd8 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 24 Apr 2020 20:41:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4=D1=83?= =?UTF-8?q?=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/doc | 2 +- cmake/etc/Variables.cmake | 2 +- examples/redis/01_client/client.cpp | 2 -- src/myx/base/CMakeLists.txt | 6 +++--- src/myx/filesystem/CMakeLists.txt | 6 +++--- src/myx/math/CMakeLists.txt | 10 +++++----- src/myx/qt/CMakeLists.txt | 6 +++--- src/myx/redis/CMakeLists.txt | 10 +++++----- src/myx/redis/client.hpp | 21 +++++++++------------ 10 files changed, 31 insertions(+), 36 deletions(-) diff --git a/cmake/cmlib b/cmake/cmlib index ea2b322..d6c1e11 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit ea2b322df6b3c53b4d9004f5ed945f496c9291c6 +Subproject commit d6c1e11d49c5857291a5e469f71d3b7e5ac6c321 diff --git a/cmake/doc b/cmake/doc index acdfb6a..a88fc86 160000 --- a/cmake/doc +++ b/cmake/doc @@ -1 +1 @@ -Subproject commit acdfb6a9dd5ca1cb037e541f7da7033968873357 +Subproject commit a88fc864d41c42c19a662572893c3a95ebdb2abc diff --git a/cmake/etc/Variables.cmake b/cmake/etc/Variables.cmake index 6c69788..227d9d4 100644 --- a/cmake/etc/Variables.cmake +++ b/cmake/etc/Variables.cmake @@ -6,7 +6,7 @@ set(DOXYGEN_GENERATE_LATEX YES) set(DOXYGEN_GENERATE_HTML YES) set(DOXYGEN_GENERATE_SQLITE YES) -set(CPACK_COMPONENTS_ALL EXAMPLES) +set(CPACK_COMPONENTS_ALL examples) set(CPACK_GENERATOR "TXZ;DEB") set(CPACK_PACKAGE_CONTACT "Andrei Astafev ") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mixed functions") diff --git a/examples/redis/01_client/client.cpp b/examples/redis/01_client/client.cpp index 3ef7ee0..befda50 100644 --- a/examples/redis/01_client/client.cpp +++ b/examples/redis/01_client/client.cpp @@ -3,8 +3,6 @@ #include #include -namespace MR = myx::redis; - int main( int argc, char** argv ) { QCoreApplication app( argc, argv ); diff --git a/src/myx/base/CMakeLists.txt b/src/myx/base/CMakeLists.txt index 4f4cc75..618541c 100644 --- a/src/myx/base/CMakeLists.txt +++ b/src/myx/base/CMakeLists.txt @@ -49,10 +49,10 @@ if(MYXLIB_BUILD_LIBRARIES) endif() endif() -generate_pkgconfig(myx-${TRGT} COMPONENT headers INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) -install(FILES ${TRGT_headers} ${CMAKE_BINARY_DIR}/include/myx/base/compiler_features.hpp COMPONENT headers +generate_pkgconfig(myx-${TRGT} COMPONENT base-dev INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) +install(FILES ${TRGT_headers} ${CMAKE_BINARY_DIR}/include/myx/base/compiler_features.hpp COMPONENT base-dev DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) # Цель, используемая только для установки заголовочных файлов без компиляции проекта -add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=headers -P +add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=base-dev -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") diff --git a/src/myx/filesystem/CMakeLists.txt b/src/myx/filesystem/CMakeLists.txt index cd7b40c..fd10c3e 100644 --- a/src/myx/filesystem/CMakeLists.txt +++ b/src/myx/filesystem/CMakeLists.txt @@ -56,9 +56,9 @@ if(MYXLIB_BUILD_LIBRARIES) endif() endif() -generate_pkgconfig(myx-${TRGT} COMPONENT headers INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) -install(FILES ${TRGT_headers} COMPONENT DEV DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) +generate_pkgconfig(myx-${TRGT} COMPONENT base-dev INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) +install(FILES ${TRGT_headers} COMPONENT base-dev DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) # Цель, используемая только для установки заголовочных файлов без компиляции проекта -add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=DEV -P +add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=base-dev -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") diff --git a/src/myx/math/CMakeLists.txt b/src/myx/math/CMakeLists.txt index dba9ad4..d6abd4c 100644 --- a/src/myx/math/CMakeLists.txt +++ b/src/myx/math/CMakeLists.txt @@ -61,15 +61,15 @@ if(MYXLIB_BUILD_LIBRARIES) target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) cotire(${TRGT}) - install(TARGETS ${TRGT}_static COMPONENT DEV ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS ${TRGT}_static COMPONENT libs-dev ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) if(BUILD_SHARED_LIBS) - install(TARGETS ${TRGT}_shared COMPONENT DEV LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS ${TRGT}_shared COMPONENT main LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() endif() -generate_pkgconfig(myx-${TRGT} COMPONENT headers INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) -install(FILES ${TRGT_headers} COMPONENT DEV DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) +generate_pkgconfig(myx-${TRGT} COMPONENT base-dev INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) +install(FILES ${TRGT_headers} COMPONENT base-dev DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) # Цель, используемая только для установки заголовочных файлов без компиляции проекта -add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=DEV -P +add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=base -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") diff --git a/src/myx/qt/CMakeLists.txt b/src/myx/qt/CMakeLists.txt index 9cf5db2..3165c21 100644 --- a/src/myx/qt/CMakeLists.txt +++ b/src/myx/qt/CMakeLists.txt @@ -50,10 +50,10 @@ if(MYXLIB_BUILD_LIBRARIES) endif() endif() -generate_pkgconfig(myx-${TRGT} COMPONENT headers INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) -install(FILES ${TRGT_headers} COMPONENT headers +generate_pkgconfig(myx-${TRGT} COMPONENT base-dev INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) +install(FILES ${TRGT_headers} COMPONENT base-dev DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) # Цель, используемая только для установки заголовочных файлов без компиляции проекта -add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=headers -P +add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=base-dev -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") diff --git a/src/myx/redis/CMakeLists.txt b/src/myx/redis/CMakeLists.txt index ec1882f..a8fc417 100644 --- a/src/myx/redis/CMakeLists.txt +++ b/src/myx/redis/CMakeLists.txt @@ -58,15 +58,15 @@ if(MYXLIB_BUILD_LIBRARIES) target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) cotire(${TRGT}) - install(TARGETS ${TRGT}_static COMPONENT DEV ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS ${TRGT}_static COMPONENT libs-dev ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) if(BUILD_SHARED_LIBS) - install(TARGETS ${TRGT}_shared COMPONENT DEV LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS ${TRGT}_shared COMPONENT main LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() endif() -install(FILES ${TRGT_headers} COMPONENT DEV DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) -install(FILES ${CMAKE_BINARY_DIR}/${TRGT}.pc COMPONENT DEV DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +generate_pkgconfig(myx-${TRGT} COMPONENT base-dev INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) +install(FILES ${TRGT_headers} COMPONENT base-dev DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) # Цель, используемая только для установки заголовочных файлов без компиляции проекта -add_custom_target(${TRGT}-install-headers COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_COMPONENT=DEV -P +add_custom_target(${TRGT}-install-headers COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_COMPONENT=base-dev -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") diff --git a/src/myx/redis/client.hpp b/src/myx/redis/client.hpp index 77f0493..7ae8a2b 100644 --- a/src/myx/redis/client.hpp +++ b/src/myx/redis/client.hpp @@ -76,7 +76,7 @@ public: */ Request* sendCommand( const QByteArray& command ); - Request* subscribeToChannel( const QByteArray& command ); + Request* subscribeToChannel( const QByteArray& channel ); /** * @brief Attempts to set the specified key to the specified value @@ -144,7 +144,7 @@ class ClientPrivate : public QObject { if ( m_queue.isEmpty() ) { return; } Q_EMIT m_queue.dequeue()->reply( const_cast< myx::redis::Reply& >( reply ) ); - } // sendReply + } Q_SLOT void sendReplyMultiBulk( const myx::redis::Reply& reply ) @@ -153,22 +153,19 @@ class ClientPrivate : public QObject QVariant v = const_cast< myx::redis::Reply& >( reply ).value(); if ( !v.isValid() ) { return; } - if ( !v.canConvert< QVariantList >() ) { return; } - auto l = v.toList(); - if ( l.size() >= 2 ) + if ( l.size() != 3 ) { return; } + + auto name = l[1].value< Reply >().value().toByteArray(); + for ( auto& request: m_list ) { - auto b = l[1].value< Reply >().value().toByteArray(); - for ( auto& request: m_list ) + if ( request->channel() == name ) { - if ( request->channel() == b ) - { - Q_EMIT request->reply( const_cast< myx::redis::Reply& >( reply ) ); - } + Q_EMIT request->reply( const_cast< myx::redis::Reply& >( reply ) ); } } - } // sendReplyMultiBulk + } }; // class ClientPrivate } // namespace redis