Small adjustments to cmake conversion

+ add multiarch support for library installation path
+ add installation of tqcaprovider.h
+ removed dependency on TDE libraries

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

CMakeLists.txt

@@ -25,6 +25,7 @@ include( CheckIncludeFile       )
 include( CheckLibraryExists     )
 include( CheckCSourceCompiles   )
 include( CheckCXXSourceCompiles )
+include( GNUInstallDirs OPTIONAL )
 
 
 #### include our cmake modules
@@ -35,6 +36,10 @@ include( TDEMacros )
 
 ##### setup install paths
 
+if( CMAKE_INSTALL_LIBDIR )
+  tde_setup_install_path( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" )
+endif( )
+
 include( TDESetupPaths )
 tde_setup_paths( )
 

ConfigureChecks.cmake

@@ -14,7 +14,6 @@ test_big_endian(WORDS_BIGENDIAN)
 
 tde_setup_largefiles( )
 find_package( TQt )
-find_package( TDE )
 
 
 ##### check for gcc visibility support
@@ -32,6 +31,3 @@ execute_process(
       OUTPUT_VARIABLE TQT_HEADERS_DIRS
       OUTPUT_STRIP_TRAILING_WHITESPACE
 )
-if( TQT_HEADER_DIRS )
-    set( TQT_HEADERS_DIRS "${TQT_HEADERS_DIRS}" )
-endif()

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}
 )
 

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

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

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