diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2020-01-03 16:34:13 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-01-03 16:34:13 +0100 |
| commit | bd91ae659cf7e7ae03fa587aeac0753c6ec78ce2 (patch) | |
| tree | 87b5559aa916029ac5abb41b4a57669a358f34a1 | |
| parent | 671faf252fe4100120aa86f1e144ae5c93b26900 (diff) | |
| download | tqca-bd91ae659cf7e7ae03fa587aeac0753c6ec78ce2.tar.gz tqca-bd91ae659cf7e7ae03fa587aeac0753c6ec78ce2.zip | |
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>
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | ConfigureChecks.cmake | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/tqca.cpp | 3 | ||||
| -rw-r--r-- | src/tqca.h | 3 | ||||
| -rw-r--r-- | src/tqcaprovider.h | 3 |
6 files changed, 16 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ba877a9..1e1ea35 100644 --- a/CMakeLists.txt +++ b/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( ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index fb41aa9..c9b5ddc 100644 --- a/ConfigureChecks.cmake +++ b/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() 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 @@ -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 |