From 7c0b5818b1df64c2c627e6fd685a732c7c1350e5 Mon Sep 17 00:00:00 2001
From: Eugene Shalygin <eugene.shalygin@gmail.com>
Date: Sun, 17 Apr 2016 01:07:15 +0200
Subject: [PATCH] cmake: add imported target for QtSingleApplication

This simplifies cmake code a bit: we remove if's and just generate
different target (imported or alias) with the same name and use it
unconditionally.
---
 cmake/Modules/FindQtSingleApplication.cmake | 12 ++++++++++++
 src/CMakeLists.txt                          |  3 +--
 src/app/CMakeLists.txt                      |  9 +--------
 src/app/qtsingleapplication/CMakeLists.txt  |  4 ++++
 src/gui/CMakeLists.txt                      |  5 ++++-
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/cmake/Modules/FindQtSingleApplication.cmake b/cmake/Modules/FindQtSingleApplication.cmake
index 4229e98b4..1865afb5f 100644
--- a/cmake/Modules/FindQtSingleApplication.cmake
+++ b/cmake/Modules/FindQtSingleApplication.cmake
@@ -79,3 +79,15 @@ ELSE (QTSINGLEAPPLICATION_FOUND)
 ENDIF (QTSINGLEAPPLICATION_FOUND)
 
 MARK_AS_ADVANCED(QTSINGLEAPPLICATION_INCLUDE_DIR QTSINGLEAPPLICATION_LIBRARY)
+
+if(NOT TARGET QtSingleApplication::QtSingleApplication)
+    add_library(QtSingleApplication::QtSingleApplication UNKNOWN IMPORTED)
+    set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}"
+    )
+    if(EXISTS "${QTSINGLEAPPLICATION_LIBRARY}")
+    set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${QTSINGLEAPPLICATION_LIBRARY}")
+    endif()
+endif(NOT TARGET QtSingleApplication::QtSingleApplication)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 49afb2e19..196871230 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -98,9 +98,8 @@ endif (GUI)
 
 if (SYSTEM_QTSINGLEAPPLICATION)
     find_package(QtSingleApplication REQUIRED)
-    include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIR})
 else (SYSTEM_QTSINGLEAPPLICATION)
-    include_directories(app/qtsingleapplication)
+    add_subdirectory(app/qtsingleapplication)
 endif (SYSTEM_QTSINGLEAPPLICATION)
 
 add_subdirectory(app)
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 0a2e4a954..dffe9ffa1 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -158,14 +158,7 @@ if (GUI AND WIN32)
     set_target_properties(${QBT_TARGET_NAME} PROPERTIES WIN32_EXECUTABLE True)
 endif (GUI AND WIN32)
 
-target_link_libraries(${QBT_TARGET_NAME} ${QBT_TARGET_LIBRARIES})
-
-if (SYSTEM_QTSINGLEAPPLICATION)
-    target_link_libraries(${QBT_TARGET_NAME} ${QTSINGLEAPPLICATION_LIBRARIES})
-else (SYSTEM_QTSINGLEAPPLICATION)
-    add_subdirectory(qtsingleapplication)
-    target_link_libraries(${QBT_TARGET_NAME} qtsingleapplication)
-endif (SYSTEM_QTSINGLEAPPLICATION)
+target_link_libraries(${QBT_TARGET_NAME} ${QBT_TARGET_LIBRARIES} QtSingleApplication::QtSingleApplication)
 
 if (APPLE)
     set(qbt_BUNDLE_NAME "${CMAKE_PROJECT_NAME}")
diff --git a/src/app/qtsingleapplication/CMakeLists.txt b/src/app/qtsingleapplication/CMakeLists.txt
index 982436b12..72001d671 100644
--- a/src/app/qtsingleapplication/CMakeLists.txt
+++ b/src/app/qtsingleapplication/CMakeLists.txt
@@ -1,3 +1,5 @@
+project(qtsingleapplication)
+
 set(QBT_QTSINGLEAPPLICATION_HEADERS
 qtlocalpeer.h
 )
@@ -15,6 +17,7 @@ else (GUI)
 endif (GUI)
 
 add_library(qtsingleapplication ${QBT_QTSINGLEAPPLICATION_HEADERS} ${QBT_QTSINGLEAPPLICATION_SOURCES})
+target_include_directories(qtsingleapplication INTERFACE "${qtsingleapplication_SOURCE_DIR}")
 
 if (QT4_FOUND)
     target_link_libraries(qtsingleapplication Qt4::QtNetwork)
@@ -30,3 +33,4 @@ if (GUI)
     endif(QT4_FOUND)
 endif (GUI)
 
+add_library(QtSingleApplication::QtSingleApplication ALIAS qtsingleapplication)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 0223b5eda..a8f5119e6 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -131,4 +131,7 @@ torrentcreatordlg.ui
 qbt_target_sources(about.qrc)
 
 add_library(qbt_gui STATIC ${QBT_GUI_HEADERS} ${QBT_GUI_SOURCES})
-target_link_libraries(qbt_gui qbt_lineedit qbt_powermanagement qbt_rss qbt_properties qbt_searchengine ${QBT_GUI_OPTIONAL_LINK_LIBRARIES} qbt_base)
+target_link_libraries(qbt_gui qbt_lineedit qbt_powermanagement qbt_rss qbt_properties qbt_searchengine
+    ${QBT_GUI_OPTIONAL_LINK_LIBRARIES} qbt_base
+    QtSingleApplication::QtSingleApplication
+)