QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-04-26 11:34:32 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Use qt5 suffix by default when installing a Qt5 version of QCA"

Browse Source 
I don't agree with this patch. See my comments on
https://git.reviewboard.kde.org/r/111938/

This reverts commit bfeabc149ed64abc1a6186b9cd3cdd57f89fa5ec.
This commit is contained in:
Ivan Romanov 2013-09-24 01:37:03 +06:00
parent 0768474121
commit 4362678874
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@ -3,7 +3,7 @@ project(QCA)
cmake_minimum_required(VERSION 2.4.5)
option(BUILD_TESTS "Create test" ON)
option(QCA_INSTALL_IN_QT_PREFIX "Install QCA in the Qt prefix instead of the Install prefix" OFF)
option(QCA_INSTALL_IN_QT_PREFIX "Install QCA in the Qt prefix instead of the Install prefix" ON)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" )
@ -23,22 +23,20 @@ if (Qt5Core_FOUND)
include(GNUInstallDirs)
setup_qt5_dirs()
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
set(QCA_LIB_SUFFIX "qt5" CACHE STRING "Qca library suffix")
else()
set(QT_MIN_VERSION "4.7.0")
find_package(Qt4 REQUIRED)
# properly set up compile flags (QT_DEBUG/QT_NO_DEBUG, ...)
include(${QT_USE_FILE})
set(QCA_LIB_SUFFIX "" CACHE STRING "Qca library suffix")
set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "Directory where lib will install")
endif()
set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "Directory where lib will install")
set(QCA_LIB_MAJOR_VERSION "2")
set(QCA_LIB_MINOR_VERSION "0")
set(QCA_LIB_PATCH_VERSION "3")
set(QCA_LIB_SUFFIX "" CACHE STRING "Qca library suffix")
if(QCA_LIB_SUFFIX)
set(QCA_LIB_NAME qca-${QCA_LIB_SUFFIX})
set(QCA_MANPAGE_NAME qcatool2-${QCA_LIB_SUFFIX}.1)
@ -91,11 +89,9 @@ set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
set(qca_INCLUDEDIR "${CMAKE_CURRENT_SOURCE_DIR}/include" )
set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}" )
set(QCA_PLUGIN_SUBDIR "${QCA_LIB_NAME}")
if( QCA_INSTALL_IN_QT_PREFIX )
set(QCA_PREFIX_INSTALL_DIR "${QT_PREFIX_DIR}" CACHE PATH "Directory where qca will install")
set(QCA_PLUGINS_INSTALL_DIR "${QT_PLUGINS_DIR}/${QCA_PLUGIN_SUBDIR}" CACHE PATH "Directory where qca plugins will install")
set(QCA_PLUGINS_INSTALL_DIR "${QT_PLUGINS_DIR}/crypto" CACHE PATH "Directory where qca plugins will install")
set(QCA_BINARY_INSTALL_DIR "${QT_BINARY_DIR}" CACHE PATH "Directory where qca plugins will install")
set(QCA_LIBRARY_INSTALL_DIR "${QT_LIBRARY_DIR}" CACHE PATH "Directory where qca library will install")
set(QCA_FEATURE_INSTALL_DIR "${QT_MKSPECS_DIR}/features" CACHE PATH "Directory where qca feature file will install")
@ -105,12 +101,16 @@ if( QCA_INSTALL_IN_QT_PREFIX )
set(QCA_MAN_INSTALL_DIR "${QT_DATA_DIR}/man" CACHE PATH "Directory where qca man pages will install")
else( QCA_INSTALL_IN_QT_PREFIX )
set(QCA_PREFIX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Directory where qca will install")
set(QCA_PLUGINS_INSTALL_DIR "${LIB_INSTALL_DIR}/plugins/${QCA_PLUGIN_SUBDIR}" CACHE PATH "Directory where qca plugins will install")
if (Qt5Core_FOUND)
set(QCA_PLUGINS_INSTALL_DIR "${LIB_INSTALL_DIR}/qt5/plugins/crypto" CACHE PATH "Directory where qca plugins will install")
else (Qt5Core_FOUND)
set(QCA_PLUGINS_INSTALL_DIR "${LIB_INSTALL_DIR}/qt4/plugins/crypto" CACHE PATH "Directory where qca plugins will install")
endif (Qt5Core_FOUND)
set(QCA_BINARY_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Directory where qca plugins will install")
set(QCA_LIBRARY_INSTALL_DIR "${LIB_INSTALL_DIR}" CACHE PATH "Directory where qca library will install")
set(QCA_FEATURE_INSTALL_DIR "${QT_MKSPECS_DIR}/features" CACHE PATH "Directory where qca feature file will install")
set(QCA_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/${QCA_LIB_SUFFIX}" CACHE PATH "Directory where qca public headers will install")
set(QCA_PRIVATE_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/${QCA_LIB_SUFFIX}" CACHE PATH "Directory where qca headers will install")
set(QCA_FEATURE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/mkspecs/features" CACHE PATH "Directory where qca feature file will install")
set(QCA_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Directory where qca public headers will install")
set(QCA_PRIVATE_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Directory where qca headers will install")
set(QCA_DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/qca/html" CACHE PATH "Directory where qca documentation will install")
set(QCA_MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Directory where qca man pages will install")
endif( QCA_INSTALL_IN_QT_PREFIX )

2
src/CMakeLists.txt
View File

@ -15,8 +15,6 @@ if(NOT MLOCK_TAKES_VOID)
ADD_DEFINITIONS(-DMLOCK_NOT_VOID_PTR)
endif(NOT MLOCK_TAKES_VOID)
configure_file(config-qca.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/config-qca.h" @ONLY)
# base source files

1
src/config-qca.h.cmake
View File

@ -1 +0,0 @@
#cmakedefine QCA_PLUGIN_SUBDIR "@QCA_PLUGIN_SUBDIR@"

5
src/qca_plugin.cpp
View File

@ -26,7 +26,7 @@
// the provider.
#include "qca_plugin.h"
#include "config-qca.h"
#include "qcaprovider.h"
#include <QCoreApplication>
@ -35,6 +35,7 @@
#include <QLibrary>
#include <QPluginLoader>
#define PLUGIN_SUBDIR "crypto"
namespace QCA {
@ -373,7 +374,7 @@ void ProviderManager::scan()
{
logDebug(QString("Checking Qt Library Path: %1").arg(*it));
QDir libpath(*it);
QDir dir(libpath.filePath(QCA_PLUGIN_SUBDIR));
QDir dir(libpath.filePath(PLUGIN_SUBDIR));
if(!dir.exists())
{
logDebug(" (No 'crypto' subdirectory)");