From 76ec0cfe075e3af758657f9aecab7d7ce7e8d387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
Date: Sat, 21 Feb 2015 12:06:47 +0100
Subject: CMake: fix Qt5 lookup, use KDE_INSTALL_TARGETS_DEFAULT_ARGS

---
 CMakeLists.txt              | 8 +++++---
 async/src/CMakeLists.txt    | 2 +-
 client/CMakeLists.txt       | 2 +-
 common/CMakeLists.txt       | 2 +-
 synchronizer/CMakeLists.txt | 2 +-
 tests/hawd/CMakeLists.txt   | 8 ++++----
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d33281..97c4466 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,11 +14,12 @@ include(GenerateExportHeader)
 #include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 include(ECMPackageConfigHelpers)
-# include(KDEInstallDirs)
+include(KDEInstallDirs)
 # include(KDEFrameworkCompilerSettings)
 # include(KDECMakeSettings)
 
-find_package(Qt5Core REQUIRED)
+find_package(Qt5 COMPONENTS REQUIRED Core Widgets Network)
+
 find_package(FlatBuffers REQUIRED)
 function(generate_flatbuffers)
     foreach(fbs ${ARGN})
@@ -41,7 +42,8 @@ include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/common)
 
 configure_file(hawd.conf hawd.conf)
 
-set(AKONADI2_RESOURCE_PLUGINS_PATH plugins/akonadi2/resources)
+set(AKONADI2_RESOURCE_PLUGINS_PATH ${QT_PLUGIN_INSTALL_DIR}/akonadi2/resources)
+
 # common, eventually a lib but right now just the command buffers
 add_subdirectory(common)
 
diff --git a/async/src/CMakeLists.txt b/async/src/CMakeLists.txt
index 85700ed..7d17f2b 100644
--- a/async/src/CMakeLists.txt
+++ b/async/src/CMakeLists.txt
@@ -9,4 +9,4 @@ set(async_SRCS
 
 add_library(${PROJECT_NAME} SHARED ${async_SRCS})
 target_link_libraries(${PROJECT_NAME} Qt5::Core)
-install(TARGETS ${PROJECT_NAME} DESTINATION lib)
+install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 023e3d0..3555b3e 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -5,4 +5,4 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 add_executable(${PROJECT_NAME} main.cpp)
 target_link_libraries(${PROJECT_NAME} akonadi2common)
 qt5_use_modules(${PROJECT_NAME} Widgets Network)
-install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 2f9c93c..429bad7 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -41,6 +41,6 @@ generate_export_header(${PROJECT_NAME} BASE_NAME Akonadi2Common EXPORT_FILE_NAME
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
 qt5_use_modules(${PROJECT_NAME} Widgets Network)
 target_link_libraries(${PROJECT_NAME} ${storage_LIBS} akonadi2async)
-install(TARGETS ${PROJECT_NAME} DESTINATION lib)
+install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 add_subdirectory(test)
diff --git a/synchronizer/CMakeLists.txt b/synchronizer/CMakeLists.txt
index 031b3b2..1f95802 100644
--- a/synchronizer/CMakeLists.txt
+++ b/synchronizer/CMakeLists.txt
@@ -10,4 +10,4 @@ set(akonadi2synchronizer_SRCS
 add_executable(${PROJECT_NAME} ${akonadi2synchronizer_SRCS})
 target_link_libraries(${PROJECT_NAME} akonadi2common)
 qt5_use_modules(${PROJECT_NAME} Widgets Network)
-install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/tests/hawd/CMakeLists.txt b/tests/hawd/CMakeLists.txt
index 7dcaf01..84c41ab 100644
--- a/tests/hawd/CMakeLists.txt
+++ b/tests/hawd/CMakeLists.txt
@@ -26,17 +26,17 @@ add_library(lib${PROJECT_NAME} SHARED ${lib_SRCS})
 generate_export_header(lib${PROJECT_NAME} BASE_NAME HAWD EXPORT_FILE_NAME hawd_export.h)
 qt5_use_modules(lib${PROJECT_NAME} Core)
 target_link_libraries(lib${PROJECT_NAME} akonadi2common)
-if (LIBGIT2_FOUND) 
+if (LIBGIT2_FOUND)
    target_link_libraries(lib${PROJECT_NAME} ${LIBGIT2_LIBRARIES})
 endif(LIBGIT2_FOUND)
 
-install(TARGETS lib${PROJECT_NAME} DESTINATION lib)
+install(TARGETS lib${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 add_executable(${PROJECT_NAME} ${SRCS})
 qt5_use_modules(${PROJECT_NAME} Core)
 target_link_libraries(${PROJECT_NAME} lib${PROJECT_NAME} ${LIBGIT2_LIBRARIES})
-if (LIBGIT2_FOUND) 
+if (LIBGIT2_FOUND)
    target_link_libraries(${PROJECT_NAME} ${LIBGIT2_LIBRARIES})
 endif(LIBGIT2_FOUND)
-install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
-- 
cgit v1.2.3