From bd91ae659cf7e7ae03fa587aeac0753c6ec78ce2 Mon Sep 17 00:00:00 2001
From: Slávek Banko <slavek.banko@axis.cz>
Date: Fri, 3 Jan 2020 16:34:13 +0100
Subject: Small adjustments to cmake conversion + add multiarch support for
 library installation path + add installation of tqcaprovider.h + removed
 dependency on TDE libraries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 src/CMakeLists.txt | 10 +++++-----
 src/tqca.cpp       |  3 ++-
 src/tqca.h         |  3 ++-
 src/tqcaprovider.h |  3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1cf2db8..9db917d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,13 +3,11 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}
-  ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${TDE_LIB_DIR}
 )
 
 
@@ -20,8 +18,8 @@ tde_add_library( ${PROJECT_NAME} SHARED AUTOMOC
   SOURCES
         tqca.cpp
   LINK
-     tdecore-shared
-     
+     ${TQT_LIBRARIES}
+
   VERSION 1.0.0
 
   DESTINATION ${LIB_INSTALL_DIR}
@@ -31,7 +29,9 @@ tde_add_library( ${PROJECT_NAME} SHARED AUTOMOC
 ##### headers
 
 install(
-    FILES ${PROJECT_NAME}.h
+    FILES
+       ${PROJECT_NAME}.h
+       ${PROJECT_NAME}provider.h
     DESTINATION ${TQT_HEADERS_DIRS}
 )
 
diff --git a/src/tqca.cpp b/src/tqca.cpp
index bd17094..bfbd78c 100644
--- a/src/tqca.cpp
+++ b/src/tqca.cpp
@@ -1,6 +1,7 @@
 /*
- * qca.cpp - Qt Cryptographic Architecture
+ * tqca.cpp - TQt Cryptographic Architecture
  * Copyright (C) 2003  Justin Karneges
+ * Copyright (C) 2010-2020  TDE Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/tqca.h b/src/tqca.h
index dc87da1..b5591f8 100644
--- a/src/tqca.h
+++ b/src/tqca.h
@@ -1,6 +1,7 @@
 /*
- * qca.h - Qt Cryptographic Architecture
+ * tqca.h - TQt Cryptographic Architecture
  * Copyright (C) 2003  Justin Karneges
+ * Copyright (C) 2010-2020  TDE Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/tqcaprovider.h b/src/tqcaprovider.h
index 27ed422..fb66e5c 100644
--- a/src/tqcaprovider.h
+++ b/src/tqcaprovider.h
@@ -1,6 +1,7 @@
 /*
- * qcaprovider.h - QCA Plugin API
+ * tqcaprovider.h - TQCA Plugin API
  * Copyright (C) 2003  Justin Karneges
+ * Copyright (C) 2010-2020  TDE Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
-- 
cgit v1.2.3