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

no digit postffix in qcatool2 name

Browse Source
This commit is contained in:
Ivan Romanov 2013-10-02 22:12:32 +06:00
parent c97846b994
commit 49f312505c
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -42,10 +42,10 @@ 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)
set(QCA_MANPAGE_NAME qcatool-${QCA_LIB_SUFFIX}.1)
else(QCA_LIB_SUFFIX)
set(QCA_LIB_NAME qca)
set(QCA_MANPAGE_NAME qcatool2.1)
set(QCA_MANPAGE_NAME qcatool.1)
endif(QCA_LIB_SUFFIX)
set(QCA_LIB_VERSION_STRING "${QCA_LIB_MAJOR_VERSION}.${QCA_LIB_MINOR_VERSION}.${QCA_LIB_PATCH_VERSION}")
@ -200,7 +200,7 @@ 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/qcatool2.1 "${CMAKE_BINARY_DIR}/${QCA_MANPAGE_NAME}" COPYONLY)
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")
add_subdirectory(src)

2
plugins/qca-pkcs11/README
View File

@ -31,7 +31,7 @@ CONFIGURATION
Configuration is stored at ~/.config/Affinix/QCA.conf, in order to
generate default configuration use:
$ qcatool2 config save qca-pkcs11
$ qcatool config save qca-pkcs11
Attributes:
allow_load_rootca (Boolean)

14
tools/qcatool/CMakeLists.txt
View File

@ -1,19 +1,19 @@
project(qcatool2)
project(qcatool)
set(qcatool2_moc_SRCS main.cpp)
set(qcatool_moc_SRCS main.cpp)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
MY_AUTOMOC( qcatool2_moc_SRCS )
MY_AUTOMOC( qcatool_moc_SRCS )
set(qcatool2_bin_SRCS ${qcatool2_moc_SRCS})
set(qcatool_bin_SRCS ${qcatool_moc_SRCS})
if(QCA_LIB_SUFFIX)
set(QCATOOL_NAME qcatool2-${QCA_LIB_SUFFIX})
set(QCATOOL_NAME qcatool-${QCA_LIB_SUFFIX})
else(QCA_LIB_SUFFIX)
set(QCATOOL_NAME qcatool2)
set(QCATOOL_NAME qcatool)
endif(QCA_LIB_SUFFIX)
add_executable(${QCATOOL_NAME} ${qcatool2_bin_SRCS})
add_executable(${QCATOOL_NAME} ${qcatool_bin_SRCS})
target_link_libraries( ${QCATOOL_NAME} ${QCA_LIB_NAME} ${QT_QTCORE_LIBRARY})