[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] messageviewer/src: Merge generate headers
From:       Montel Laurent <montel () kde ! org>
Date:       2015-09-30 19:06:13
Message-ID: E1ZhMhh-0001F5-Ac () scm ! kde ! org
[Download RAW message or body]

Git commit a8ea0c7a924b4201b5ce31bc4868463acd188fd9 by Montel Laurent.
Committed on 30/09/2015 at 19:05.
Pushed by mlaurent into branch 'master'.

Merge generate headers

M  +4    -13   messageviewer/src/CMakeLists.txt

http://commits.kde.org/kdepim/a8ea0c7a924b4201b5ce31bc4868463acd188fd9

diff --git a/messageviewer/src/CMakeLists.txt b/messageviewer/src/CMakeList=
s.txt
index 7513e60..1958a3e 100644
--- a/messageviewer/src/CMakeLists.txt
+++ b/messageviewer/src/CMakeLists.txt
@@ -353,6 +353,9 @@ ecm_generate_headers(MessageViewer_header_HEADERS
   GrantleeHeaderTestStyle
   HeaderStyle
   KXFace
+  HeaderStylePlugin
+  RichHeaderStrategy
+  HeaderStylePluginManager
   REQUIRED_HEADERS MessageViewer_header_HEADERS
   PREFIX MessageViewer
   RELATIVE header
@@ -394,19 +397,9 @@ ecm_generate_headers(MessageViewer_viewerplugin_HEADERS
   RELATIVE viewerplugins =

 )
 =

-ecm_generate_headers(MessageViewer_header_HEADERS
-  HEADER_NAMES
-  HeaderStylePlugin
-  RichHeaderStrategy
-  HeaderStylePluginManager
-  REQUIRED_HEADERS MessageViewer_header_HEADERS
-  PREFIX MessageViewer
-  RELATIVE header
-)
-
 ecm_generate_pri_file(BASE_NAME MessageViewer
     LIB_NAME KF5MessageViewer
-    DEPS "PimCommon MessageCore AkonadiCore AkonadiMime Contacts" FILENAME=
_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/Message=
Viewer
+    DEPS "PimCommon MessageCore AkonadiCore AkonadiMime Contacts Libkleo" =
FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}=
/MessageViewer
 )
 =

 if(${CMAKE_SOURCE_DIR} STREQUAL ${MessageViewer_SOURCE_DIR})
@@ -417,7 +410,6 @@ install(FILES
     ${MessageViewer_gravatar_HEADERS}
     ${MessageViewer_adblock_HEADERS}
     ${MessageViewer_htmlwriter_HEADERS}
-    ${MessageViewer_header_HEADERS}
     ${MessageViewer_utils_HEADERS}
     ${MessageViewer_interfaces_HEADERS}
     ${MessageViewer_viewer_HEADERS}
@@ -428,7 +420,6 @@ install(FILES
 )
 =

 install(FILES
-    ${MessageViewer_header_HEADERS}
     ${MessageViewer_viewerplugin_HEADERS}
     ${MessageViewer_settings_HEADERS}
     ${MessageViewer_gravatar_HEADERS}

[prev in list] [next in list] [prev in thread] [next in thread]