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

Обновление подмодулей

Browse Source
This commit is contained in:
Andrei Astafev 2020-04-24 20:41:27 +03:00
parent f3ba15d64d
commit 407d073f23
10 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/cmlib

@ -1 +1 @@
Subproject commit ea2b322df6b3c53b4d9004f5ed945f496c9291c6 Subproject commit d6c1e11d49c5857291a5e469f71d3b7e5ac6c321

2
cmake/doc

@ -1 +1 @@
Subproject commit acdfb6a9dd5ca1cb037e541f7da7033968873357 Subproject commit a88fc864d41c42c19a662572893c3a95ebdb2abc

2
cmake/etc/Variables.cmake
View File

@ -6,7 +6,7 @@ set(DOXYGEN_GENERATE_LATEX YES)
set(DOXYGEN_GENERATE_HTML YES) set(DOXYGEN_GENERATE_HTML YES)
set(DOXYGEN_GENERATE_SQLITE YES) set(DOXYGEN_GENERATE_SQLITE YES)
set(CPACK_COMPONENTS_ALL EXAMPLES) set(CPACK_COMPONENTS_ALL examples)
set(CPACK_GENERATOR "TXZ;DEB") set(CPACK_GENERATOR "TXZ;DEB")
set(CPACK_PACKAGE_CONTACT "Andrei Astafev <dev@246060.ru>") set(CPACK_PACKAGE_CONTACT "Andrei Astafev <dev@246060.ru>")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mixed functions") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mixed functions")

2
examples/redis/01_client/client.cpp
View File

@ -3,8 +3,6 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QDebug> #include <QDebug>
namespace MR = myx::redis;
int main( int argc, char** argv ) int main( int argc, char** argv )
{ {
QCoreApplication app( argc, argv ); QCoreApplication app( argc, argv );

6
src/myx/base/CMakeLists.txt
View File

@ -49,10 +49,10 @@ if(MYXLIB_BUILD_LIBRARIES)
endif() endif()
endif() endif()
generate_pkgconfig(myx-${TRGT} COMPONENT headers INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) 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 headers install(FILES ${TRGT_headers} ${CMAKE_BINARY_DIR}/include/myx/base/compiler_features.hpp COMPONENT base-dev
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) 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") "${CMAKE_BINARY_DIR}/cmake_install.cmake")

6
src/myx/filesystem/CMakeLists.txt
View File

@ -56,9 +56,9 @@ if(MYXLIB_BUILD_LIBRARIES)
endif() endif()
endif() endif()
generate_pkgconfig(myx-${TRGT} COMPONENT headers INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) generate_pkgconfig(myx-${TRGT} COMPONENT base-dev INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES})
install(FILES ${TRGT_headers} COMPONENT DEV DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) 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") "${CMAKE_BINARY_DIR}/cmake_install.cmake")

10
src/myx/math/CMakeLists.txt
View File

@ -61,15 +61,15 @@ if(MYXLIB_BUILD_LIBRARIES)
target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src)
cotire(${TRGT}) 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) 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()
endif() endif()
generate_pkgconfig(myx-${TRGT} COMPONENT headers INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) generate_pkgconfig(myx-${TRGT} COMPONENT base-dev INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES})
install(FILES ${TRGT_headers} COMPONENT DEV DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) 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") "${CMAKE_BINARY_DIR}/cmake_install.cmake")

6
src/myx/qt/CMakeLists.txt
View File

@ -50,10 +50,10 @@ if(MYXLIB_BUILD_LIBRARIES)
endif() endif()
endif() endif()
generate_pkgconfig(myx-${TRGT} COMPONENT headers INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) generate_pkgconfig(myx-${TRGT} COMPONENT base-dev INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES})
install(FILES ${TRGT_headers} COMPONENT headers install(FILES ${TRGT_headers} COMPONENT base-dev
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) 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") "${CMAKE_BINARY_DIR}/cmake_install.cmake")

10
src/myx/redis/CMakeLists.txt
View File

@ -58,15 +58,15 @@ if(MYXLIB_BUILD_LIBRARIES)
target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src)
cotire(${TRGT}) 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) 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()
endif() endif()
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 ${CMAKE_BINARY_DIR}/${TRGT}.pc COMPONENT DEV DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) 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") "${CMAKE_BINARY_DIR}/cmake_install.cmake")

21
src/myx/redis/client.hpp
View File

@ -76,7 +76,7 @@ public:
*/ */
Request* sendCommand( const QByteArray& command ); 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 * @brief Attempts to set the specified key to the specified value
@ -144,7 +144,7 @@ class ClientPrivate : public QObject
{ {
if ( m_queue.isEmpty() ) { return; } if ( m_queue.isEmpty() ) { return; }
Q_EMIT m_queue.dequeue()->reply( const_cast< myx::redis::Reply& >( reply ) ); Q_EMIT m_queue.dequeue()->reply( const_cast< myx::redis::Reply& >( reply ) );
} // sendReply }
Q_SLOT void sendReplyMultiBulk( const myx::redis::Reply& reply ) 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(); QVariant v = const_cast< myx::redis::Reply& >( reply ).value();
if ( !v.isValid() ) { return; } if ( !v.isValid() ) { return; }
if ( !v.canConvert< QVariantList >() ) { return; } if ( !v.canConvert< QVariantList >() ) { return; }
auto l = v.toList(); 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(); if ( request->channel() == name )
for ( auto& request: m_list )
{ {
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 }; // class ClientPrivate
} // namespace redis } // namespace redis