diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 4c58315f..749bc573 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -24,6 +24,7 @@ build() { -GNinja \ -DMKSPECS_INSTALL_DIR=lib/qt/mkspecs/modules \ -DBUILD_DOCS=ON \ + -DBUILD_WITH_SYSTEMD=ON \ -DBUILD_EXAMPLES=OFF \ -DQCH_INSTALL_DESTINATION=share/doc/qt \ -DCMAKE_INSTALL_LIBDIR=lib \ diff --git a/debian/rules b/debian/rules index c9404da4..df25bf79 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,7 @@ endif dh $@ override_dh_auto_configure: - dh_auto_configure -- -DBUILD_EXAMPLES=OFF -DBUILD_DOCS=ON -DBUILD_VERSION=$(BUILD_VER) -DDTK_VERSION=$(PACK_VER) -DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata + dh_auto_configure -- -DBUILD_WITH_SYSTEMD=ON -DBUILD_EXAMPLES=OFF -DBUILD_DOCS=ON -DBUILD_VERSION=$(BUILD_VER) -DDTK_VERSION=$(PACK_VER) -DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata #override_dh_auto_test: # echo "skip auto test" diff --git a/dtkcore.cmake b/dtkcore.cmake index 3a7307c8..95c98d41 100644 --- a/dtkcore.cmake +++ b/dtkcore.cmake @@ -27,6 +27,9 @@ if(UNIX AND NOT APPLE) endif() set (BUILD_WITH_SYSTEMD OFF CACHE BOOL "Build with systemd") +if (BUILD_WITH_SYSTEMD) + add_definitions(-DBUILD_WITH_SYSTEMD) +endif() set(CMAKE_CXX_STANDARD 17) diff --git a/src/log/LogManager.cpp b/src/log/LogManager.cpp index 50246fff..5ff0c194 100644 --- a/src/log/LogManager.cpp +++ b/src/log/LogManager.cpp @@ -149,6 +149,8 @@ void DLogManager::initJournalAppender() Q_D(DLogManager); d->m_journalAppender = new JournalAppender(); dlogger->registerAppender(d->m_journalAppender); +#else + qWarning() << "BUILD_WITH_SYSTEMD not defined or OS not support!!"; #endif } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a42284de..bc1b5a29 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -21,9 +21,6 @@ if(LINUX) if("${QT_VERSION_MAJOR}" STREQUAL "5") pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt) endif() - if(BUILD_WITH_SYSTEMD) - pkg_check_modules(Systemd REQUIRED IMPORTED_TARGET libsystemd) - endif() endif() find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Xml) @@ -88,13 +85,6 @@ if(LINUX) ) endif() - if(BUILD_WITH_SYSTEMD) - target_link_libraries( - ${BIN_NAME} PRIVATE - PkgConfig::Systemd - ) - endif() - target_link_libraries( ${BIN_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::DBus