mirror of
https://github.com/QuasarApp/qca.git
synced 2025-05-08 00:39:33 +00:00
renamed QCA_LIB_SUFFIX to QCA_SUFFIX
also anothers cmake optimizations
This commit is contained in:
parent
013d6846fc
commit
094929f903
@ -39,14 +39,16 @@ set(QCA_LIB_MAJOR_VERSION "2")
|
|||||||
set(QCA_LIB_MINOR_VERSION "0")
|
set(QCA_LIB_MINOR_VERSION "0")
|
||||||
set(QCA_LIB_PATCH_VERSION "3")
|
set(QCA_LIB_PATCH_VERSION "3")
|
||||||
|
|
||||||
set(QCA_LIB_SUFFIX "" CACHE STRING "Qca library suffix")
|
set(QCA_SUFFIX "" CACHE STRING "QCA common suffix")
|
||||||
if(QCA_LIB_SUFFIX)
|
if(QCA_SUFFIX)
|
||||||
set(QCA_LIB_NAME qca-${QCA_LIB_SUFFIX})
|
set(QCA_LIB_NAME qca-${QCA_SUFFIX})
|
||||||
set(QCA_MANPAGE_NAME qcatool-${QCA_LIB_SUFFIX}.1)
|
set(QCA_TOOL_NAME qcatool-${QCA_SUFFIX})
|
||||||
else(QCA_LIB_SUFFIX)
|
set(QCA_PC_NAME qca2-${QCA_SUFFIX}.pc)
|
||||||
|
else(QCA_SUFFIX)
|
||||||
set(QCA_LIB_NAME qca)
|
set(QCA_LIB_NAME qca)
|
||||||
set(QCA_MANPAGE_NAME qcatool.1)
|
set(QCA_TOOL_NAME qcatool)
|
||||||
endif(QCA_LIB_SUFFIX)
|
set(QCA_PC_NAME qca2.pc)
|
||||||
|
endif(QCA_SUFFIX)
|
||||||
|
|
||||||
set(QCA_LIB_VERSION_STRING "${QCA_LIB_MAJOR_VERSION}.${QCA_LIB_MINOR_VERSION}.${QCA_LIB_PATCH_VERSION}")
|
set(QCA_LIB_VERSION_STRING "${QCA_LIB_MAJOR_VERSION}.${QCA_LIB_MINOR_VERSION}.${QCA_LIB_PATCH_VERSION}")
|
||||||
|
|
||||||
@ -187,12 +189,6 @@ install(FILES ${public_HEADERS} DESTINATION "${QCA_INCLUDE_INSTALL_DIR}/QtCrypto
|
|||||||
include_directories(${QT_QTCORE_INCLUDE_DIR} "${qca_INCLUDEDIR}/QtCrypto")
|
include_directories(${QT_QTCORE_INCLUDE_DIR} "${qca_INCLUDEDIR}/QtCrypto")
|
||||||
|
|
||||||
if(NOT WIN32)
|
if(NOT WIN32)
|
||||||
if(QCA_LIB_SUFFIX)
|
|
||||||
set(QCA_PC_NAME "qca2-${QCA_LIB_SUFFIX}.pc")
|
|
||||||
else(QCA_LIB_SUFFIX)
|
|
||||||
set(QCA_PC_NAME "qca2.pc")
|
|
||||||
endif(QCA_LIB_SUFFIX)
|
|
||||||
|
|
||||||
configure_file("qca2.pc.cmake" "${CMAKE_BINARY_DIR}/${QCA_PC_NAME}" @ONLY)
|
configure_file("qca2.pc.cmake" "${CMAKE_BINARY_DIR}/${QCA_PC_NAME}" @ONLY)
|
||||||
install(FILES "${CMAKE_BINARY_DIR}/${QCA_PC_NAME}" DESTINATION ${PKGCONFIG_INSTALL_PREFIX})
|
install(FILES "${CMAKE_BINARY_DIR}/${QCA_PC_NAME}" DESTINATION ${PKGCONFIG_INSTALL_PREFIX})
|
||||||
endif(NOT WIN32)
|
endif(NOT WIN32)
|
||||||
@ -200,8 +196,8 @@ endif(NOT WIN32)
|
|||||||
configure_file("crypto.prf.cmake" "${CMAKE_BINARY_DIR}/crypto.prf" @ONLY)
|
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 "${QCA_FEATURE_INSTALL_DIR}")
|
||||||
|
|
||||||
configure_file(man/qcatool.1 "${CMAKE_BINARY_DIR}/${QCA_MANPAGE_NAME}" COPYONLY)
|
configure_file(man/qcatool.1 "${CMAKE_BINARY_DIR}/${QCA_TOOL_NAME}.1" COPYONLY)
|
||||||
install(FILES "${CMAKE_BINARY_DIR}/${QCA_MANPAGE_NAME}" DESTINATION "${QCA_MAN_INSTALL_DIR}/man1")
|
install(FILES "${CMAKE_BINARY_DIR}/${QCA_TOOL_NAME}.1" DESTINATION "${QCA_MAN_INSTALL_DIR}/man1")
|
||||||
|
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
add_subdirectory(tools)
|
add_subdirectory(tools)
|
||||||
|
4
INSTALL
4
INSTALL
@ -19,8 +19,8 @@ Notes
|
|||||||
in Qt prefix (by default: "")
|
in Qt prefix (by default: "")
|
||||||
QT4_BUILD - forced Qt4 building (by default: OFF)
|
QT4_BUILD - forced Qt4 building (by default: OFF)
|
||||||
BUILD_TESTS - build unittests (by default: ON)
|
BUILD_TESTS - build unittests (by default: ON)
|
||||||
QCA_LIB_SUFFIX - suffix will be used for library, qcatool binary,
|
QCA_SUFFIX - suffix will be used for library, qcatool binary,
|
||||||
qcatool manpage and qca pkg-config file (by default: "")
|
qcatool manpage and qca pkg-config file (by default: "")
|
||||||
LIB_SUFFIX - library directory suffix (by default: "")
|
LIB_SUFFIX - library directory suffix (by default: "")
|
||||||
LIB_INSTALL_DIR - path to library directory
|
LIB_INSTALL_DIR - path to library directory
|
||||||
(by default: ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
|
(by default: ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
|
||||||
|
@ -7,14 +7,8 @@ MY_AUTOMOC( qcatool_moc_SRCS )
|
|||||||
|
|
||||||
set(qcatool_bin_SRCS ${qcatool_moc_SRCS})
|
set(qcatool_bin_SRCS ${qcatool_moc_SRCS})
|
||||||
|
|
||||||
if(QCA_LIB_SUFFIX)
|
add_executable(${QCA_TOOL_NAME} ${qcatool_bin_SRCS})
|
||||||
set(QCATOOL_NAME qcatool-${QCA_LIB_SUFFIX})
|
|
||||||
else(QCA_LIB_SUFFIX)
|
|
||||||
set(QCATOOL_NAME qcatool)
|
|
||||||
endif(QCA_LIB_SUFFIX)
|
|
||||||
|
|
||||||
add_executable(${QCATOOL_NAME} ${qcatool_bin_SRCS})
|
target_link_libraries( ${QCA_TOOL_NAME} ${QCA_LIB_NAME} ${QT_QTCORE_LIBRARY})
|
||||||
|
|
||||||
target_link_libraries( ${QCATOOL_NAME} ${QCA_LIB_NAME} ${QT_QTCORE_LIBRARY})
|
install(TARGETS ${QCA_TOOL_NAME} DESTINATION "${QCA_BINARY_INSTALL_DIR}")
|
||||||
|
|
||||||
install(TARGETS ${QCATOOL_NAME} DESTINATION "${QCA_BINARY_INSTALL_DIR}")
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user