QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-05-06 07:49:34 +00:00
Code Issues Projects Releases Wiki Activity

Revert "install qca to prefix or qt_prefix"

Browse Source 
This reverts commit f5cb5b04dcb37ab4a62943c19646bcfa3d7d3b23.
This commit is contained in:
Ivan Romanov 2013-07-25 14:23:16 +06:00
parent 57aa7db0e3
commit e0cdd5db40
16 changed files with 54 additions and 95 deletions

53
CMakeLists.txt

@ -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" ON)
option(QCA_INSTALL_PLUGINS_IN_QT_PREFIX "Install plugins in the Qt prefix instead of the Install prefix" OFF)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" )
@ -27,6 +27,8 @@ else()
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Directory where lib will install")
endif()
set(PKGCONFIG_INSTALL_PREFIX "${LIB_INSTALL_DIR}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
if (Qt5Core_FOUND)
set(QCA_LIB_MAJOR_VERSION "3")
else()
@ -40,14 +42,14 @@ set(QCA_LIB_VERSION_STRING "${QCA_LIB_MAJOR_VERSION}.${QCA_LIB_MINOR_VERSION}.${
if (APPLE)
find_package(Carbon REQUIRED)
set(CMAKE_INSTALL_NAME_DIR ${QCA_LIBRARY_INSTALL_DIR})
set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif (APPLE)
# set up RPATH handling, so the libs are found if they are installed to a non-standard location, Alex
if (UNIX AND NOT APPLE)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
set(CMAKE_INSTALL_RPATH "${QCA_LIBRARY_INSTALL_DIR}" )
set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}" )
endif (UNIX AND NOT APPLE)
@ -79,39 +81,12 @@ 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}" )
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}/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")
set(QCA_INCLUDE_INSTALL_DIR "${QT_INCLUDE_DIR}" CACHE PATH "Directory where qca public headers will install")
set(QCA_PRIVATE_INCLUDE_INSTALL_DIR "${QT_INCLUDE_DIR}" CACHE PATH "Directory where qca headers will install")
set(QCA_DOC_INSTALL_DIR "${QT_DOC_DIR}/html/qca/" CACHE PATH "Directory where qca documentation will install")
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}/qt4/plugins/crypto" CACHE PATH "Directory where qca plugins will install")
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 "${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 )
set(PKGCONFIG_INSTALL_PREFIX "${QCA_LIBRARY_INSTALL_DIR}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
message(STATUS "QCA prefix is " ${QCA_PREFIX_INSTALL_DIR})
message(STATUS "Plugins will be installed to " ${QCA_PLUGINS_INSTALL_DIR})
message(STATUS "Binary will be installed to " ${QCA_BINARY_INSTALL_DIR})
message(STATUS "Library will be installed to " ${QCA_LIBRARY_INSTALL_DIR})
message(STATUS "Feature file will be installed to " ${QCA_FEATURE_INSTALL_DIR})
message(STATUS "Public headers will be installed to " ${QCA_INCLUDE_INSTALL_DIR})
message(STATUS "Private headers will be installed to " ${QCA_PRIVATE_INCLUDE_INSTALL_DIR})
message(STATUS "Documentation will be installed to " ${QCA_DOC_INSTALL_DIR})
message(STATUS "Man page will be installed to " ${QCA_MAN_INSTALL_DIR})
if( QCA_INSTALL_PLUGINS_IN_QT_PREFIX )
set(qca_PLUGINSDIR "${QT_PLUGINS_DIR}/crypto/")
else()
set(qca_PLUGINSDIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qt4/plugins/crypto/" )
endif()
message(STATUS "Plugins will be installed to " ${qca_PLUGINSDIR})
include(QcaMacro)
@ -176,7 +151,7 @@ set( public_HEADERS
set( qca_HEADERS ${private_HEADERS} ${public_HEADERS} )
#install public headers only
install(FILES ${public_HEADERS} DESTINATION "${QCA_INCLUDE_INSTALL_DIR}/QtCrypto")
install(FILES ${public_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/QtCrypto")
include_directories(${QT_QTCORE_INCLUDE_DIR} "${qca_INCLUDEDIR}/QtCrypto")
@ -186,9 +161,9 @@ if(NOT WIN32)
endif(NOT WIN32)
configure_file("crypto.prf.cmake" "${CMAKE_BINARY_DIR}/crypto.prf" @ONLY)
install(FILES "${CMAKE_BINARY_DIR}/crypto.prf" DESTINATION "${QCA_FEATURE_INSTALL_DIR}")
install(FILES "${CMAKE_BINARY_DIR}/crypto.prf" DESTINATION ${CMAKE_INSTALL_PREFIX}/mkspecs/features)
install(FILES man/qcatool2.1 DESTINATION "${QCA_MAN_INSTALL_DIR}/man1")
install(FILES man/qcatool2.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
add_subdirectory(src)
add_subdirectory(tools)

16
cmake/modules/FindQt4.cmake

@ -267,22 +267,6 @@ IF (QT4_QMAKE_FOUND)
MARK_AS_ADVANCED(QT_USE_FRAMEWORKS)
ENDIF (APPLE)
# ask qmake for prefix
IF (NOT QT_PREFIX_DIR)
EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
ARGS "-query QT_INSTALL_PREFIX"
OUTPUT_VARIABLE qt_prefix )
SET(QT_PREFIX_DIR ${qt_prefix} CACHE INTERNAL "")
ENDIF (NOT QT_PREFIX_DIR)
# ask qmake for the data dir
IF (NOT QT_DATA_DIR)
EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
ARGS "-query QT_INSTALL_DATA"
OUTPUT_VARIABLE qt_data )
SET(QT_DATA_DIR ${qt_data} CACHE INTERNAL "")
ENDIF (NOT QT_DATA_DIR)
# ask qmake for the binary dir
IF (NOT QT_BINARY_DIR)
EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}

4
crypto.prf.cmake

@ -1,5 +1,5 @@
QCA_INCDIR = @QCA_INCLUDE_INSTALL_DIR@
QCA_LIBDIR = @QCA_LIBRARY_INSTALL_DIR@
QCA_INCDIR = @CMAKE_INSTALL_PREFIX@/include
QCA_LIBDIR = @LIB_INSTALL_DIR@
CONFIG *= qt
INCLUDEPATH += $$QCA_INCDIR/QtCrypto

6
plugins/qca-botan/CMakeLists.txt

@ -9,7 +9,7 @@ ADD_LIBRARY(qca-botan MODULE ${QCA_BOTAN_SOURCES})
TARGET_LINK_LIBRARIES(qca-botan ${QT_QTCORE_LIBRARY} qca ${BOTAN_LIBRARIES})
INSTALL(TARGETS qca-botan
LIBRARY DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
ARCHIVE DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
RUNTIME DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
LIBRARY DESTINATION ${qca_PLUGINSDIR}
ARCHIVE DESTINATION ${qca_PLUGINSDIR}
RUNTIME DESTINATION ${qca_PLUGINSDIR}
)

8
plugins/qca-cyrus-sasl/CMakeLists.txt

@ -9,7 +9,7 @@ ADD_LIBRARY(qca-cyrus-sasl MODULE ${QCA_SASL_SOURCES})
TARGET_LINK_LIBRARIES(qca-cyrus-sasl ${QT_QTCORE_LIBRARY} qca ${SASL2_LIBRARIES})
INSTALL(TARGETS qca-cyrus-sasl
LIBRARY DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
ARCHIVE DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
RUNTIME DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
)
LIBRARY DESTINATION ${qca_PLUGINSDIR}
ARCHIVE DESTINATION ${qca_PLUGINSDIR}
RUNTIME DESTINATION ${qca_PLUGINSDIR}
)

6
plugins/qca-gcrypt/CMakeLists.txt

@ -9,7 +9,7 @@ ADD_LIBRARY(qca-gcrypt MODULE ${QCA_GCRYPT_SOURCES})
TARGET_LINK_LIBRARIES(qca-gcrypt ${QT_QTCORE_LIBRARY} qca ${LIBGCRYPT_LIBRARIES})
INSTALL(TARGETS qca-gcrypt
LIBRARY DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
ARCHIVE DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
RUNTIME DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
LIBRARY DESTINATION ${qca_PLUGINSDIR}
ARCHIVE DESTINATION ${qca_PLUGINSDIR}
RUNTIME DESTINATION ${qca_PLUGINSDIR}
)

6
plugins/qca-gnupg/CMakeLists.txt

@ -18,7 +18,7 @@ IF (WIN32)
ENDIF (WIN32)
INSTALL(TARGETS qca-gnupg DESTINATION
LIBRARY DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
ARCHIVE DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
RUNTIME DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
LIBRARY DESTINATION ${qca_PLUGINSDIR}
ARCHIVE DESTINATION ${qca_PLUGINSDIR}
RUNTIME DESTINATION ${qca_PLUGINSDIR}
)

6
plugins/qca-logger/CMakeLists.txt

@ -11,7 +11,7 @@ TARGET_LINK_LIBRARIES(qca-logger ${QT_QTCORE_LIBRARY})
TARGET_LINK_LIBRARIES(qca-logger qca)
INSTALL(TARGETS qca-logger
LIBRARY DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
ARCHIVE DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
RUNTIME DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
LIBRARY DESTINATION ${qca_PLUGINSDIR}
ARCHIVE DESTINATION ${qca_PLUGINSDIR}
RUNTIME DESTINATION ${qca_PLUGINSDIR}
)

6
plugins/qca-nss/CMakeLists.txt

@ -11,7 +11,7 @@ ADD_LIBRARY(qca-nss MODULE ${QCA_NSS_SOURCES})
TARGET_LINK_LIBRARIES(qca-nss ${QT_QTCORE_LIBRARY} qca ${NSS_LIBRARIES})
INSTALL(TARGETS qca-nss
LIBRARY DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
ARCHIVE DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
RUNTIME DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
LIBRARY DESTINATION ${qca_PLUGINSDIR}
ARCHIVE DESTINATION ${qca_PLUGINSDIR}
RUNTIME DESTINATION ${qca_PLUGINSDIR}
)

6
plugins/qca-ossl/CMakeLists.txt

@ -29,7 +29,7 @@ IF (WIN32)
ENDIF (WIN32)
INSTALL(TARGETS qca-ossl
LIBRARY DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
ARCHIVE DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
RUNTIME DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
LIBRARY DESTINATION ${qca_PLUGINSDIR}
ARCHIVE DESTINATION ${qca_PLUGINSDIR}
RUNTIME DESTINATION ${qca_PLUGINSDIR}
)

6
plugins/qca-pkcs11/CMakeLists.txt

@ -15,7 +15,7 @@ IF (WIN32)
ENDIF (WIN32)
INSTALL(TARGETS qca-pkcs11
LIBRARY DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
ARCHIVE DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
RUNTIME DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
LIBRARY DESTINATION ${qca_PLUGINSDIR}
ARCHIVE DESTINATION ${qca_PLUGINSDIR}
RUNTIME DESTINATION ${qca_PLUGINSDIR}
)

6
plugins/qca-softstore/CMakeLists.txt

@ -11,7 +11,7 @@ TARGET_LINK_LIBRARIES(qca-softstore ${QT_QTCORE_LIBRARY})
TARGET_LINK_LIBRARIES(qca-softstore qca)
INSTALL(TARGETS qca-softstore
LIBRARY DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
ARCHIVE DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
RUNTIME DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
LIBRARY DESTINATION ${qca_PLUGINSDIR}
ARCHIVE DESTINATION ${qca_PLUGINSDIR}
RUNTIME DESTINATION ${qca_PLUGINSDIR}
)

6
plugins/qca-wincrypto/CMakeLists.txt

@ -12,8 +12,8 @@ IF (WIN32)
TARGET_LINK_LIBRARIES (qca-wincrypto advapi32)
INSTALL (TARGETS qca-wincrypto
LIBRARY DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
ARCHIVE DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
RUNTIME DESTINATION "${QCA_PLUGINS_INSTALL_DIR}"
LIBRARY DESTINATION ${qca_PLUGINSDIR}
ARCHIVE DESTINATION ${qca_PLUGINSDIR}
RUNTIME DESTINATION ${qca_PLUGINSDIR}
)
ENDIF (WIN32)

8
qca2.pc.cmake

@ -1,7 +1,7 @@
prefix=@QCA_PREFIX_INSTALL_DIR@
exec_prefix=@QCA_PREFIX_INSTALL_DIR@
libdir=@QCA_LIBRARY_INSTALL_DIR@
includedir=@QCA_INCLUDE_INSTALL_DIR@/QtCrypto
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@
libdir=@LIB_INSTALL_DIR@
includedir=@CMAKE_INSTALL_PREFIX@/include/QtCrypto
Name: QCA
Description: Qt Cryptographic Architecture library

4
src/CMakeLists.txt

@ -148,7 +148,7 @@ set_target_properties(qca PROPERTIES
)
INSTALL(TARGETS qca
LIBRARY DESTINATION "${QCA_LIBRARY_INSTALL_DIR}"
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
RUNTIME DESTINATION bin
ARCHIVE DESTINATION "${QCA_LIBRARY_INSTALL_DIR}"
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
)

2
tools/qcatool/CMakeLists.txt

@ -10,4 +10,4 @@ add_executable(qcatool2 ${qcatool2_bin_SRCS})
target_link_libraries( qcatool2 qca ${QT_QTCORE_LIBRARY})
install(TARGETS qcatool2 DESTINATION "${QCA_BINARY_INSTALL_DIR}")
install(TARGETS qcatool2 DESTINATION bin)