Библиотека требует сборки в объектный файл (из-за moc)

This commit is contained in:
Andrei Astafev 2020-06-28 09:52:03 +03:00
parent ca83f98484
commit a4d00ed80b
21 changed files with 84 additions and 271 deletions

View File

@ -23,11 +23,7 @@ endif()
include(CMLibCommon)
option(MYXLIB_BUILD_LIBRARIES "Build libraries" OFF)
if(MYXLIB_BUILD_LIBRARIES)
option(MYXLIB_BUILD_EXAMPLES "Build examples" OFF)
endif()
option(MYXLIB_BUILD_EXAMPLES_HO "Build examples using header only version" OFF)
# Поиск библиотек с помощью pkgconfig
find_package(PkgConfig REQUIRED)
@ -45,10 +41,12 @@ add_subdirectory(src/myx/filesystem)
add_subdirectory(src/myx/qt)
# Примеры
if(MYXLIB_BUILD_EXAMPLES OR MYXLIB_BUILD_EXAMPLES_HO)
if(MYXLIB_BUILD_EXAMPLES)
add_subdirectory(examples/base)
add_subdirectory(examples/filesystem)
add_subdirectory(examples/qt)
add_custom_target(examples example-base-endian example-filesystem-paths example-qt-tranlators
example-qt-posix-signal-watcher)
endif()
# Документация

View File

@ -1,5 +1,5 @@
# Название основной цели в текущем каталоге
set(TRGT example-endian-minimal)
set(TRGT example-base-endian)
# Список файлов исходных текстов
set(TRGT_cpp ${CMAKE_CURRENT_SOURCE_DIR}/endian.cpp)
@ -50,28 +50,3 @@ if(MYXLIB_BUILD_EXAMPLES)
# Правила для установки
install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(MYXLIB_BUILD_EXAMPLES_HO)
# Цель для создания исполняемого файла
add_executable(${TRGT}-ho ${TRGT_cpp} ${TRGT_qrc})
common_target_properties(${TRGT}-ho)
target_include_directories(${TRGT}-ho PRIVATE ${CMAKE_SOURCE_DIR}/src)
target_include_directories(${TRGT}-ho SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
add_dependencies(${TRGT}-ho base-header-only)
target_link_libraries(${TRGT}-ho Qt5::Core)
target_link_libraries(${TRGT}-ho Threads::Threads)
# Имя выходного файла для цели
set_target_properties(${TRGT}-ho PROPERTIES OUTPUT_NAME endian-minimal-ho)
add_sanitizers(${TRGT}-ho)
cotire(${TRGT}-ho)
add_dependencies(${TRGT}-ho create_auxilary_symlinks)
# Правила для установки
install(TARGETS ${TRGT}-ho COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()

View File

@ -5,8 +5,6 @@
#define CMLIB_PROJECT_NAME "myxlib"
namespace MB = myx::base;
int main( int argc, char** argv )
{

View File

@ -1,8 +1,8 @@
# Название основной цели в текущем каталоге
set(TRGT example-filesystem-minimal)
set(TRGT example-filesystem-paths)
# Список файлов исходных текстов
set(TRGT_cpp ${CMAKE_CURRENT_SOURCE_DIR}/minimal.cpp)
set(TRGT_cpp ${CMAKE_CURRENT_SOURCE_DIR}/paths.cpp)
if(MYXLIB_BUILD_EXAMPLES)
# Путь поиска библиотек внутри проекта
@ -50,28 +50,3 @@ if(MYXLIB_BUILD_EXAMPLES)
# Правила для установки
install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(MYXLIB_BUILD_EXAMPLES_HO)
# Цель для создания исполняемого файла
add_executable(${TRGT}-ho ${TRGT_cpp} ${TRGT_qrc})
common_target_properties(${TRGT}-ho)
target_include_directories(${TRGT}-ho PRIVATE ${CMAKE_SOURCE_DIR}/src)
target_include_directories(${TRGT}-ho SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
add_dependencies(${TRGT}-ho base-header-only filesystem-header-only)
target_link_libraries(${TRGT}-ho Qt5::Core)
target_link_libraries(${TRGT}-ho Threads::Threads)
# Имя выходного файла для цели
set_target_properties(${TRGT}-ho PROPERTIES OUTPUT_NAME filesystem-minimal-ho)
add_sanitizers(${TRGT}-ho)
cotire(${TRGT}-ho)
add_dependencies(${TRGT}-ho create_auxilary_symlinks)
# Правила для установки
install(TARGETS ${TRGT}-ho COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()

View File

@ -1 +1 @@
add_subdirectory(01_minimal)
add_subdirectory(01_paths)

View File

@ -11,7 +11,6 @@ qt5_translation(
LANGUAGES ru_RU)
if(MYXLIB_BUILD_EXAMPLES)
# Путь поиска библиотек внутри проекта
link_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
@ -58,28 +57,3 @@ if(MYXLIB_BUILD_EXAMPLES)
# Правила для установки
install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(MYXLIB_BUILD_EXAMPLES_HO)
# Цель для создания исполняемого файла
add_executable(${TRGT}-ho ${TRGT_cpp} ${TRGT_qrc})
common_target_properties(${TRGT}-ho)
target_include_directories(${TRGT}-ho PRIVATE ${CMAKE_SOURCE_DIR}/src)
target_include_directories(${TRGT}-ho SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
add_dependencies(${TRGT}-ho base-header-only qt-header-only)
target_link_libraries(${TRGT}-ho Qt5::Core)
target_link_libraries(${TRGT}-ho Threads::Threads)
# Имя выходного файла для цели
set_target_properties(${TRGT}-ho PROPERTIES OUTPUT_NAME qt-translators-ho)
add_sanitizers(${TRGT}-ho)
cotire(${TRGT}-ho)
add_dependencies(${TRGT}-ho create_auxilary_symlinks)
# Правила для установки
install(TARGETS ${TRGT}-ho COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()

View File

@ -51,33 +51,3 @@ if(MYXLIB_BUILD_EXAMPLES)
# Правила для установки
install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(MYXLIB_BUILD_EXAMPLES_HO)
set(TRGT_moc_hpp
${CMAKE_SOURCE_DIR}/src/myx/qt/posix_signal_watcher.hpp
${CMAKE_SOURCE_DIR}/src/myx/qt/posix_signal_watcher_p.hpp)
qt5_wrap_cpp(TRGT_moc_cpp ${TRGT_moc_hpp})
# Цель для создания исполняемого файла
add_executable(${TRGT}-ho ${TRGT_cpp} ${TRGT_moc_cpp})
common_target_properties(${TRGT}-ho)
target_include_directories(${TRGT}-ho PRIVATE ${CMAKE_SOURCE_DIR}/src)
target_include_directories(${TRGT}-ho SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
add_dependencies(${TRGT}-ho base-header-only qt-header-only)
target_link_libraries(${TRGT}-ho Qt5::Core)
target_link_libraries(${TRGT}-ho Threads::Threads)
# Имя выходного файла для цели
set_target_properties(${TRGT}-ho PROPERTIES OUTPUT_NAME qt-posix-signal-watcher-ho)
add_sanitizers(${TRGT}-ho)
cotire(${TRGT}-ho)
add_dependencies(${TRGT}-ho create_auxilary_symlinks)
# Правила для установки
install(TARGETS ${TRGT}-ho COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()

View File

@ -17,12 +17,6 @@ set(TRGT_hpp
set(TRGT_headers ${TRGT_hpp})
# cmake-format: on
add_library(${TRGT}-header-only INTERFACE)
target_include_directories(
${TRGT}-header-only SYSTEM INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
if(MYXLIB_BUILD_LIBRARIES)
add_common_library(${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_cpp} ${TRGT_headers})
common_target_properties(${TRGT})
@ -41,16 +35,12 @@ if(MYXLIB_BUILD_LIBRARIES)
# Создание цели для автоматического форматирования кода
add_format_sources(${TRGT} ${TRGT_cpp} ${TRGT_headers})
target_compile_definitions(${TRGT} PUBLIC MYXLIB_BUILD_LIBRARIES)
target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src)
install(TARGETS ${TRGT}_static COMPONENT libs-dev ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
if(BUILD_SHARED_LIBS)
install(TARGETS ${TRGT}_shared COMPONENT main LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
else()
install(FILES ${TRGT_cpp} COMPONENT base-dev DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT})
endif()
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

View File

@ -1,10 +1 @@
#ifndef MYX_BASE_CONFIG_CPP_
#define MYX_BASE_CONFIG_CPP_
#ifndef MYXLIB_HEADER_ONLY
#include <myx/base/config.hpp>
#else
#pragma once
#endif
#endif // MYX_BASE_CONFIG_CPP_

View File

@ -3,9 +3,6 @@
#pragma once
#ifdef MYXLIB_BUILD_LIBRARIES
#undef MYXLIB_HEADER_ONLY
#if defined( _WIN32 ) && defined( MYXLIB_SHARED_LIB )
#ifdef myxlib_EXPORTS
#define MYXLIB_API __declspec( dllexport )
@ -16,14 +13,5 @@
#define MYXLIB_API
#endif
#define MYXLIB_INLINE
#else
#define MYXLIB_HEADER_ONLY
#define MYXLIB_API
#define MYXLIB_INLINE inline
#endif // ifdef MYXLIB_BUILD_LIBRARIES
#ifdef MYXLIB_HEADER_ONLY
#include "config.cpp"
#endif
#endif // MYX_BASE_CONFIG_HPP_

View File

@ -49,8 +49,8 @@ protected:
static T transform( const T& b )
{
const uint16_t i = 1;
return( ( reinterpret_cast< const char& >( i ) == 1 ) ? b : EndianTypesBase< T >::swapBytes( b ) );
const uint16_t k_i = 1;
return( ( reinterpret_cast< const char& >( k_i ) == 1 ) ? b : EndianTypesBase< T >::swapBytes( b ) );
}
@ -110,8 +110,8 @@ protected:
static T transform( const T& b )
{
const uint16_t i = 1;
return( ( reinterpret_cast< const char& >( i ) == 1 ) ? EndianTypesBase< T >::swapBytes( b ) : b );
const uint16_t k_i = 1;
return( ( reinterpret_cast< const char& >( k_i ) == 1 ) ? EndianTypesBase< T >::swapBytes( b ) : b );
}

View File

@ -11,13 +11,6 @@ set(TRGT_hpp ${CMAKE_CURRENT_SOURCE_DIR}/paths.hpp)
set(TRGT_headers ${TRGT_hpp})
# cmake-format: on
add_library(${TRGT}-header-only INTERFACE)
target_include_directories(
${TRGT}-header-only SYSTEM INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
if(MYXLIB_BUILD_LIBRARIES)
add_common_library(${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_cpp} ${TRGT_headers})
common_target_properties(${TRGT})
@ -36,7 +29,6 @@ if(MYXLIB_BUILD_LIBRARIES)
# Создание цели для автоматического форматирования кода
add_format_sources(${TRGT} ${TRGT_cpp} ${TRGT_headers})
target_compile_definitions(${TRGT} PUBLIC MYXLIB_BUILD_LIBRARIES)
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src)
cotire(${TRGT})
@ -45,12 +37,10 @@ if(MYXLIB_BUILD_LIBRARIES)
if(BUILD_SHARED_LIBS)
install(TARGETS ${TRGT}_shared COMPONENT main LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
else()
install(FILES ${TRGT_cpp} COMPONENT base-dev DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT})
endif()
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})
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=base-dev -P

View File

@ -1,13 +1,8 @@
#ifndef MYX_BASE_PATHS_CPP_
#define MYX_BASE_PATHS_CPP_
#ifndef MYXLIB_HEADER_ONLY
#include <myx/filesystem/paths.hpp>
#else
#pragma once
#endif
#include <myx/base/config.hpp>
#include <myx/filesystem/paths.hpp>
#include <paths.h>

View File

@ -232,8 +232,4 @@ public:
} // namespace myx
#ifdef MYXLIB_HEADER_ONLY
#include "paths.cpp"
#endif
#endif // MYX_FILESYSTEM_PATHS_HPP_

View File

@ -26,14 +26,8 @@ set(TRGT_headers ${TRGT_moc_hpp} ${TRGT_hpp})
qt5_wrap_cpp(TRGT_moc_cpp ${TRGT_moc_private_hpp} ${TRGT_moc_hpp})
add_library(${TRGT}-header-only INTERFACE)
target_include_directories(
${TRGT}-header-only SYSTEM INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
if(MYXLIB_BUILD_LIBRARIES)
add_common_library(${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_cpp} ${TRGT_moc_cpp} ${TRGT_moc_private_hpp} ${TRGT_headers})
add_common_library(${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_cpp} ${TRGT_moc_cpp}
${TRGT_moc_private_hpp} ${TRGT_headers})
common_target_properties(${TRGT})
# Создание цели для проверки утилитой clang-tidy
@ -51,7 +45,6 @@ if(MYXLIB_BUILD_LIBRARIES)
# Создание цели для автоматического форматирования кода
add_format_sources(${TRGT} ${TRGT_cpp} ${TRGT_headers} ${TRGT_moc_private_hpp})
target_compile_definitions(${TRGT} PUBLIC MYXLIB_BUILD_LIBRARIES)
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src)
target_include_directories(${TRGT} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
@ -61,12 +54,10 @@ if(MYXLIB_BUILD_LIBRARIES)
if(BUILD_SHARED_LIBS)
install(TARGETS ${TRGT}_shared COMPONENT main LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
else()
install(FILES ${TRGT_cpp} COMPONENT base-dev DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT})
endif()
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})
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=base-dev -P

View File

@ -3,19 +3,14 @@
#include <myx/base/config.hpp>
#ifndef MYXLIB_HEADER_ONLY
#include <myx/qt/posix_signal_watcher_p.hpp>
#include <myx/qt/posix_signal_watcher.hpp>
#else
#pragma once
#endif
#include <myx/qt/posix_signal_watcher_p.hpp>
namespace myx {
namespace qt {
int PosixSignalWatcherPrivate::m_sockpair[2] = {0, 0};
std::array< int, 2 > PosixSignalWatcherPrivate::mSockpair = { 0, 0 };
PosixSignalWatcherPrivate::~PosixSignalWatcherPrivate() = default;
@ -24,7 +19,7 @@ PosixSignalWatcherPrivate::PosixSignalWatcherPrivate( PosixSignalWatcher* q ) :
{
#if MYX_QT_HAS_POSIX_SIGNALS
// Create socket pair
if ( ::socketpair( AF_UNIX, SOCK_STREAM, 0, m_sockpair ) )
if ( ::socketpair( AF_UNIX, SOCK_STREAM, 0, mSockpair.data() ) != 0 )
{
qDebug() << "PosixSignalWatcher: socketpair: " << ::strerror( errno );
return;
@ -32,7 +27,7 @@ PosixSignalWatcherPrivate::PosixSignalWatcherPrivate( PosixSignalWatcher* q ) :
#endif
// Create a notifier for the read end of the pair
m_notifier.reset( new QSocketNotifier( m_sockpair[1], QSocketNotifier::Read ) );
m_notifier.reset( new QSocketNotifier( mSockpair[1], QSocketNotifier::Read ) );
// Called when the signal handler has written to the socket pair.
@ -57,7 +52,7 @@ PosixSignalWatcherPrivate::PosixSignalWatcherPrivate( PosixSignalWatcher* q ) :
* This provides a way to break out of the asynchronous context from which the
* signal handler is called and back into the Qt event loop.
*/
void PosixSignalWatcherPrivate::watchForSignal( int signal )
MYXLIB_INLINE void PosixSignalWatcherPrivate::watchForSignal( int signal )
{
if ( m_watchedSignals.contains( signal ) )
{
@ -67,12 +62,12 @@ void PosixSignalWatcherPrivate::watchForSignal( int signal )
#if MYX_QT_HAS_POSIX_SIGNALS
// Register a sigaction which will write to the socket pair
struct sigaction sigact;
struct sigaction sigact {};
sigact.sa_handler = PosixSignalWatcherPrivate::signalHandler;
sigact.sa_flags = 0;
sigemptyset( &sigact.sa_mask );
sigact.sa_flags |= SA_RESTART;
if ( ::sigaction( signal, &sigact, nullptr ) )
if ( ::sigaction( signal, &sigact, nullptr ) != 0 )
{
qDebug() << "PosixSignalWatcher: sigaction: " << ::strerror( errno );
return;
@ -89,7 +84,7 @@ void PosixSignalWatcherPrivate::watchForSignal( int signal )
*/
MYXLIB_INLINE void PosixSignalWatcherPrivate::signalHandler( int signal )
{
(void)::write( m_sockpair[0], &signal, sizeof( signal ) );
(void)::write( mSockpair[0], &signal, sizeof( signal ) );
}

View File

@ -33,7 +33,7 @@ class PosixSignalWatcher : public QObject
public:
explicit PosixSignalWatcher( QObject* parent = nullptr );
~PosixSignalWatcher();
~PosixSignalWatcher() override;
void watchForSignal( int signal );
Q_SIGNAL void posixSignal( int signal );
@ -47,9 +47,4 @@ private:
} // namespace myx
#ifdef MYXLIB_HEADER_ONLY
#include "posix_signal_watcher_p.hpp"
#include "posix_signal_watcher.cpp"
#endif
#endif // ifndef MYX_QT_POSIX_SIGNAL_WATCHER_HPP_

View File

@ -1,8 +1,9 @@
#ifndef MYX_QT_POSIX_SIGNAL_WATCHER_P_HPP_
#define MYX_QT_POSIX_SIGNAL_WATCHER_P_HPP_
#include <myx/base/config.hpp>
#pragma once
#include <myx/base/config.hpp>
#include <myx/qt/posix_signal_watcher.hpp>
#include <QObject>
@ -47,10 +48,10 @@ public:
static void signalHandler( int signal );
private:
PosixSignalWatcher* const q_ptr = nullptr;
Q_DECLARE_PUBLIC( PosixSignalWatcher )
static int m_sockpair[2];
PosixSignalWatcher* const q_ptr = nullptr;
static std::array< int, 2 > mSockpair;
std::unique_ptr< QSocketNotifier > m_notifier;
QList< int > m_watchedSignals;
}; // class PosixSignalWatcherPrivate

View File

@ -2,12 +2,7 @@
#define MYX_QT_TRANSLATORS_CPP_
#include <myx/base/config.hpp>
#ifndef MYXLIB_HEADER_ONLY
#include <myx/qt/translators.hpp>
#else
#pragma once
#endif
#include <QCoreApplication>
#include <QLibraryInfo>

View File

@ -20,8 +20,4 @@ void append_translators( QTranslatorsList& translators, const QString& appName )
} // namespace myx
#ifdef MYXLIB_HEADER_ONLY
#include "translators.cpp"
#endif
#endif // ifndef MYX_QT_TRANSLATORS_HPP_