From 094929f903dabe25dd0b3e85bd1d2c8228284595 Mon Sep 17 00:00:00 2001
From: Ivan Romanov <drizt@land.ru>
Date: Wed, 2 Oct 2013 22:49:27 +0600
Subject: [PATCH] renamed QCA_LIB_SUFFIX to QCA_SUFFIX
also anothers cmake optimizations
---
CMakeLists.txt | 26 +++++++++++---------------
INSTALL | 4 ++--
tools/qcatool/CMakeLists.txt | 12 +++---------
3 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8823d580..c414758b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,14 +39,16 @@ 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 qcatool-${QCA_LIB_SUFFIX}.1)
-else(QCA_LIB_SUFFIX)
+set(QCA_SUFFIX "" CACHE STRING "QCA common suffix")
+if(QCA_SUFFIX)
+ set(QCA_LIB_NAME qca-${QCA_SUFFIX})
+ set(QCA_TOOL_NAME qcatool-${QCA_SUFFIX})
+ set(QCA_PC_NAME qca2-${QCA_SUFFIX}.pc)
+else(QCA_SUFFIX)
set(QCA_LIB_NAME qca)
- set(QCA_MANPAGE_NAME qcatool.1)
-endif(QCA_LIB_SUFFIX)
+ set(QCA_TOOL_NAME qcatool)
+ 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}")
@@ -187,12 +189,6 @@ install(FILES ${public_HEADERS} DESTINATION "${QCA_INCLUDE_INSTALL_DIR}/QtCrypto
include_directories(${QT_QTCORE_INCLUDE_DIR} "${qca_INCLUDEDIR}/QtCrypto")
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)
install(FILES "${CMAKE_BINARY_DIR}/${QCA_PC_NAME}" DESTINATION ${PKGCONFIG_INSTALL_PREFIX})
endif(NOT WIN32)
@@ -200,8 +196,8 @@ 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}")
-configure_file(man/qcatool.1 "${CMAKE_BINARY_DIR}/${QCA_MANPAGE_NAME}" COPYONLY)
-install(FILES "${CMAKE_BINARY_DIR}/${QCA_MANPAGE_NAME}" DESTINATION "${QCA_MAN_INSTALL_DIR}/man1")
+configure_file(man/qcatool.1 "${CMAKE_BINARY_DIR}/${QCA_TOOL_NAME}.1" COPYONLY)
+install(FILES "${CMAKE_BINARY_DIR}/${QCA_TOOL_NAME}.1" DESTINATION "${QCA_MAN_INSTALL_DIR}/man1")
add_subdirectory(src)
add_subdirectory(tools)
diff --git a/INSTALL b/INSTALL
index 08b40731..cf847a03 100644
--- a/INSTALL
+++ b/INSTALL
@@ -19,8 +19,8 @@ Notes
in Qt prefix (by default: "")
QT4_BUILD - forced Qt4 building (by default: OFF)
BUILD_TESTS - build unittests (by default: ON)
- QCA_LIB_SUFFIX - suffix will be used for library, qcatool binary,
- qcatool manpage and qca pkg-config file (by default: "")
+ QCA_SUFFIX - suffix will be used for library, qcatool binary,
+ qcatool manpage and qca pkg-config file (by default: "")
LIB_SUFFIX - library directory suffix (by default: "")
LIB_INSTALL_DIR - path to library directory
(by default: ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
diff --git a/tools/qcatool/CMakeLists.txt b/tools/qcatool/CMakeLists.txt
index e77f56de..864483d0 100644
--- a/tools/qcatool/CMakeLists.txt
+++ b/tools/qcatool/CMakeLists.txt
@@ -7,14 +7,8 @@ MY_AUTOMOC( qcatool_moc_SRCS )
set(qcatool_bin_SRCS ${qcatool_moc_SRCS})
-if(QCA_LIB_SUFFIX)
- set(QCATOOL_NAME qcatool-${QCA_LIB_SUFFIX})
-else(QCA_LIB_SUFFIX)
- set(QCATOOL_NAME qcatool)
-endif(QCA_LIB_SUFFIX)
+add_executable(${QCA_TOOL_NAME} ${qcatool_bin_SRCS})
-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 ${QCATOOL_NAME} DESTINATION "${QCA_BINARY_INSTALL_DIR}")
+install(TARGETS ${QCA_TOOL_NAME} DESTINATION "${QCA_BINARY_INSTALL_DIR}")