From 3257d2fbd585198c43c4207f0a74fd971c6d8bb6 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 22 May 2014 15:25:33 +0100 Subject: [PATCH] Compile kdsingleapplicationguard as separate lib --- src/libtomahawk/CMakeLists.txt | 5 ---- src/tomahawk/CMakeLists.txt | 2 ++ src/tomahawk/TomahawkApp.h | 2 +- src/tomahawk/main.cpp | 2 +- thirdparty/CMakeLists.txt | 1 + .../kdsingleapplicationguard/CMakeLists.txt | 24 +++++++++++++++++++ .../kdsingleapplicationguard/LICENSE.LGPL.txt | 0 .../kdlockedsharedmemorypointer.cpp | 0 .../kdlockedsharedmemorypointer.h | 0 .../kdsharedmemorylocker.cpp | 0 .../kdsharedmemorylocker.h | 0 .../kdsingleapplicationguard.cpp | 0 .../kdsingleapplicationguard.h | 11 ++++----- .../kdtoolsglobal.cpp | 0 .../kdsingleapplicationguard/kdtoolsglobal.h | 0 .../kdsingleapplicationguard/pimpl_ptr.cpp | 0 .../kdsingleapplicationguard/pimpl_ptr.h | 0 17 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 thirdparty/kdsingleapplicationguard/CMakeLists.txt rename {src/libtomahawk/thirdparty => thirdparty}/kdsingleapplicationguard/LICENSE.LGPL.txt (100%) rename {src/libtomahawk/thirdparty => thirdparty}/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp (100%) rename {src/libtomahawk/thirdparty => thirdparty}/kdsingleapplicationguard/kdlockedsharedmemorypointer.h (100%) rename {src/libtomahawk/thirdparty => thirdparty}/kdsingleapplicationguard/kdsharedmemorylocker.cpp (100%) rename {src/libtomahawk/thirdparty => thirdparty}/kdsingleapplicationguard/kdsharedmemorylocker.h (100%) rename {src/libtomahawk/thirdparty => thirdparty}/kdsingleapplicationguard/kdsingleapplicationguard.cpp (100%) rename {src/libtomahawk/thirdparty => thirdparty}/kdsingleapplicationguard/kdsingleapplicationguard.h (93%) rename {src/libtomahawk/thirdparty => thirdparty}/kdsingleapplicationguard/kdtoolsglobal.cpp (100%) rename {src/libtomahawk/thirdparty => thirdparty}/kdsingleapplicationguard/kdtoolsglobal.h (100%) rename {src/libtomahawk/thirdparty => thirdparty}/kdsingleapplicationguard/pimpl_ptr.cpp (100%) rename {src/libtomahawk/thirdparty => thirdparty}/kdsingleapplicationguard/pimpl_ptr.h (100%) diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 1dd3a31fb..e12349013 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -370,11 +370,6 @@ list(APPEND libSources utils/WeakObjectHash.cpp utils/WeakObjectList.cpp utils/PluginLoader.cpp - - thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp - thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp - thirdparty/kdsingleapplicationguard/kdtoolsglobal.cpp - thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp ) add_subdirectory( accounts/configstorage ) diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt index 765c6922f..be8813227 100644 --- a/src/tomahawk/CMakeLists.txt +++ b/src/tomahawk/CMakeLists.txt @@ -97,6 +97,7 @@ INCLUDE_DIRECTORIES( mac ${THIRDPARTY_DIR}/libcrashreporter-qt/src/ + ${THIRDPARTY_DIR}/kdsingleapplicationguard/ ${TAGLIB_INCLUDES} ${LIBATTICA_INCLUDE_DIR} @@ -178,6 +179,7 @@ IF( WITH_CRASHREPORTER ) ENDIF() TARGET_LINK_LIBRARIES( tomahawk_bin + kdsingleapplicationguard ${LINK_LIBRARIES} ${TOMAHAWK_WIDGETS_LIBRARIES} ${TOMAHAWK_PLAYDARAPI_LIBRARIES} diff --git a/src/tomahawk/TomahawkApp.h b/src/tomahawk/TomahawkApp.h index f04cfd7f8..e7e7f69f1 100644 --- a/src/tomahawk/TomahawkApp.h +++ b/src/tomahawk/TomahawkApp.h @@ -28,7 +28,7 @@ #include "Typedefs.h" #include "libtomahawk-playdarapi/PlaydarApi.h" #include "utils/TomahawkUtils.h" -#include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h" +#include "kdsingleapplicationguard.h" #include "HeadlessCheck.h" #include "config.h" diff --git a/src/tomahawk/main.cpp b/src/tomahawk/main.cpp index 91d885df0..02c0e10e1 100644 --- a/src/tomahawk/main.cpp +++ b/src/tomahawk/main.cpp @@ -19,7 +19,7 @@ #include "TomahawkApp.h" -#include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h" +#include "kdsingleapplicationguard.h" #include "UbuntuUnityHack.h" #include "TomahawkSettings.h" #include "utils/TomahawkUtils.h" diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index 1369d0232..036f517b9 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -1,4 +1,5 @@ ADD_SUBDIRECTORY( qxt ) +ADD_SUBDIRECTORY( kdsingleapplicationguard ) IF( WITH_CRASHREPORTER ) ADD_SUBDIRECTORY( libcrashreporter-qt ) ENDIF() diff --git a/thirdparty/kdsingleapplicationguard/CMakeLists.txt b/thirdparty/kdsingleapplicationguard/CMakeLists.txt new file mode 100644 index 000000000..8354f5240 --- /dev/null +++ b/thirdparty/kdsingleapplicationguard/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 2.6) +project(kdsingleapplicationguard) + +list(APPEND kdsingleapplicationguard_INCLUDE_DIRECTORIES + ${QT_INCLUDES} + ${QT_QTCORE_INCLUDE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) + +list(APPEND kdsingleapplicationguard_SOURCES + kdsingleapplicationguard.cpp + kdsharedmemorylocker.cpp + kdtoolsglobal.cpp + kdlockedsharedmemorypointer.cpp +) + +include_directories(${kdsingleapplicationguard_INCLUDE_DIRECTORIES}) +add_library(kdsingleapplicationguard STATIC ${kdsingleapplicationguard_SOURCES}) +set_target_properties( + kdsingleapplicationguard + PROPERTIES + AUTOMOC TRUE +) +qt5_use_modules(kdsingleapplicationguard Core) diff --git a/src/libtomahawk/thirdparty/kdsingleapplicationguard/LICENSE.LGPL.txt b/thirdparty/kdsingleapplicationguard/LICENSE.LGPL.txt similarity index 100% rename from src/libtomahawk/thirdparty/kdsingleapplicationguard/LICENSE.LGPL.txt rename to thirdparty/kdsingleapplicationguard/LICENSE.LGPL.txt diff --git a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp b/thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp similarity index 100% rename from src/libtomahawk/thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp rename to thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp diff --git a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h b/thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h similarity index 100% rename from src/libtomahawk/thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h rename to thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h diff --git a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp b/thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp similarity index 100% rename from src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp rename to thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp diff --git a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.h b/thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.h similarity index 100% rename from src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.h rename to thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.h diff --git a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp b/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp similarity index 100% rename from src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp rename to thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp diff --git a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h b/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h similarity index 93% rename from src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h rename to thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h index 169b0d3d7..315c097c0 100644 --- a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h +++ b/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h @@ -1,22 +1,21 @@ #ifndef __KDTOOLSCORE_KDSINGLEAPPLICATIONGUARD_H__ #define __KDTOOLSCORE_KDSINGLEAPPLICATIONGUARD_H__ -#include +#include #ifndef QT_NO_SHAREDMEMORY -#include -#include +#include +#include #include "pimpl_ptr.h" -#include "DllMacro.h" #include template class QVector; class QCoreApplication; -class DLLEXPORT KDSingleApplicationGuard : public QObject +class KDSingleApplicationGuard : public QObject { Q_OBJECT Q_ENUMS( Policy ) @@ -78,7 +77,7 @@ private: kdtools::pimpl_ptr< Private > d; }; -class DLLEXPORT KDSingleApplicationGuard::Instance { +class KDSingleApplicationGuard::Instance { friend class ::KDSingleApplicationGuard; friend class ::KDSingleApplicationGuard::Private; Instance( const QStringList &, bool, qint64 ); diff --git a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdtoolsglobal.cpp b/thirdparty/kdsingleapplicationguard/kdtoolsglobal.cpp similarity index 100% rename from src/libtomahawk/thirdparty/kdsingleapplicationguard/kdtoolsglobal.cpp rename to thirdparty/kdsingleapplicationguard/kdtoolsglobal.cpp diff --git a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdtoolsglobal.h b/thirdparty/kdsingleapplicationguard/kdtoolsglobal.h similarity index 100% rename from src/libtomahawk/thirdparty/kdsingleapplicationguard/kdtoolsglobal.h rename to thirdparty/kdsingleapplicationguard/kdtoolsglobal.h diff --git a/src/libtomahawk/thirdparty/kdsingleapplicationguard/pimpl_ptr.cpp b/thirdparty/kdsingleapplicationguard/pimpl_ptr.cpp similarity index 100% rename from src/libtomahawk/thirdparty/kdsingleapplicationguard/pimpl_ptr.cpp rename to thirdparty/kdsingleapplicationguard/pimpl_ptr.cpp diff --git a/src/libtomahawk/thirdparty/kdsingleapplicationguard/pimpl_ptr.h b/thirdparty/kdsingleapplicationguard/pimpl_ptr.h similarity index 100% rename from src/libtomahawk/thirdparty/kdsingleapplicationguard/pimpl_ptr.h rename to thirdparty/kdsingleapplicationguard/pimpl_ptr.h