diff --git a/CMakeLists.txt b/CMakeLists.txt index 771744c5..e6aa8fa1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ cmake_minimum_required(VERSION 2.6.0) option(BUILD_TESTS "Create test" ON) option(BUILD_TOOLS "Compile mozcerts and qcatool" ON) set(BUILD_PLUGINS "auto" CACHE STRING "Plugins for building (also possible values: none, all and auto)") +option(SHARED_LIBRARY "Build shared library" ON) string(TOLOWER "${BUILD_PLUGINS}" BUILD_PLUGINS) if(NOT BUILD_PLUGINS) @@ -38,12 +39,33 @@ if (Qt5Core_FOUND) else() set(QT_MIN_VERSION "4.7.0") set(QT_USE_IMPORTED_TARGETS ON) - find_package(Qt4 REQUIRED QtCore) + if(BUILD_TESTS) + find_package(Qt4 REQUIRED QtCore QtNetwork QtTest) + else(BUILD_TESTS) + find_package(Qt4 REQUIRED QtCore) + endif(BUILD_TESTS) + # properly set up compile flags (QT_DEBUG/QT_NO_DEBUG, ...) include(${QT_USE_FILE}) setup_qt4_dirs() endif() +if(SHARED_LIBRARY) + set(LIBRARY_TYPE "SHARED") +else(SHARED_LIBRARY) + set(LIBRARY_TYPE "STATIC") +endif(SHARED_LIBRARY) + +# QCA can be shared but plugins will be static +# if Qt is static. +if(NOT SHARED_LIBRARY OR QT_IS_STATIC) + set(STATIC_PLUGINS ON) + add_definitions(-DQT_STATICPLUGIN) + set(PLUGIN_TYPE "STATIC") +else(NOT SHARED_LIBRARY OR QT_IS_STATIC) + set(PLUGIN_TYPE "MODULE") +endif(NOT SHARED_LIBRARY OR QT_IS_STATIC) + set(QCA_LIB_MAJOR_VERSION "2") set(QCA_LIB_MINOR_VERSION "0") set(QCA_LIB_PATCH_VERSION "3") @@ -81,6 +103,8 @@ endif (CMAKE_COMPILER_IS_GNUCXX) add_definitions (${QT_DEFINITIONS}) include_directories("include/QtCrypto/") +# for generated files +include_directories(${CMAKE_BINARY_DIR}) # uninstall target configure_file( @@ -224,6 +248,18 @@ install(FILES "${CMAKE_BINARY_DIR}/${QCA_TOOL_NAME}.1" DESTINATION "${QCA_MAN_IN add_subdirectory(src) add_subdirectory(plugins) + +if(STATIC_PLUGINS) + # Generate header with static plugins list + file(WRITE "${CMAKE_BINARY_DIR}/import_plugins.h" "#include \n") + foreach(PLUGIN IN LISTS PLUGINS) + if(WITH_${PLUGIN}_PLUGIN_INTERNAL) + string(REPLACE "-" "_" IMPORT_NAME "qca-${PLUGIN}") + file(APPEND "${CMAKE_BINARY_DIR}/import_plugins.h" "Q_IMPORT_PLUGIN(${IMPORT_NAME})\n") + endif(WITH_${PLUGIN}_PLUGIN_INTERNAL) + endforeach(PLUGIN IN LISTS PLUGINS) +endif(STATIC_PLUGINS) + if(BUILD_TESTS) enable_testing() add_subdirectory(unittest) diff --git a/cmake/modules/QcaMacro.cmake b/cmake/modules/QcaMacro.cmake index 91b7d089..d4fa8404 100644 --- a/cmake/modules/QcaMacro.cmake +++ b/cmake/modules/QcaMacro.cmake @@ -68,3 +68,27 @@ endmacro(enable_plugin) macro(disable_plugin PLUGIN) set_enabled_plugin(${PLUGIN} "off") endmacro(disable_plugin) + +# it used to build examples and tools +macro(target_link_qca_libraries TARGET) + # Link with QCA library + target_link_libraries(${TARGET} ${QT_QTCORE_LIBRARY}) + target_link_libraries(${TARGET} ${QCA_LIB_NAME}) + + # Statically link with all enabled QCA plugins + if(STATIC_PLUGINS) + target_link_libraries(${TARGET} ${QT_QTCORE_LIB_DEPENDENCIES}) + foreach(PLUGIN IN LISTS PLUGINS) + # Check plugin for enabled + if(WITH_${PLUGIN}_PLUGIN_INTERNAL) + target_link_libraries(${TARGET} qca-${PLUGIN}) + endif(WITH_${PLUGIN}_PLUGIN_INTERNAL) + endforeach(PLUGIN) + endif(STATIC_PLUGINS) +endmacro(target_link_qca_libraries) + +# it used to build unittests +macro(target_link_qca_test_libraries TARGET) + target_link_qca_libraries(${TARGET}) + target_link_libraries(${TARGET} ${QT_QTTEST_LIBRARY}) +endmacro(target_link_qca_test_libraries) diff --git a/examples/aes-cmac/CMakeLists.txt b/examples/aes-cmac/CMakeLists.txt index 1f873c99..9dcdb2e3 100644 --- a/examples/aes-cmac/CMakeLists.txt +++ b/examples/aes-cmac/CMakeLists.txt @@ -2,5 +2,4 @@ set(aes-cmac_bin_SRCS aes-cmac.cpp) add_executable(aes-cmac ${aes-cmac_bin_SRCS}) -target_link_libraries( aes-cmac ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY}) - +target_link_qca_libraries(aes-cmac) diff --git a/examples/aes-cmac/aes-cmac.cpp b/examples/aes-cmac/aes-cmac.cpp index b7332f63..105b2407 100644 --- a/examples/aes-cmac/aes-cmac.cpp +++ b/examples/aes-cmac/aes-cmac.cpp @@ -25,6 +25,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class AESCMACContext : public QCA::MACContext { public: diff --git a/examples/base64test/CMakeLists.txt b/examples/base64test/CMakeLists.txt index bad09e2a..f07551a2 100644 --- a/examples/base64test/CMakeLists.txt +++ b/examples/base64test/CMakeLists.txt @@ -2,5 +2,4 @@ set(base64test_bin_SRCS base64test.cpp) add_executable(base64test ${base64test_bin_SRCS}) -target_link_libraries( base64test ${QCA_LIB_NAME} ${QT_QTCORE_LIBRARY}) - +target_link_qca_libraries(base64test) diff --git a/examples/base64test/base64test.cpp b/examples/base64test/base64test.cpp index f3fc1e3a..113de5b8 100644 --- a/examples/base64test/base64test.cpp +++ b/examples/base64test/base64test.cpp @@ -26,6 +26,10 @@ #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + int main(int argc, char **argv) { QCoreApplication(argc, argv); diff --git a/examples/certtest/CMakeLists.txt b/examples/certtest/CMakeLists.txt index 814e7d09..83bfeb77 100644 --- a/examples/certtest/CMakeLists.txt +++ b/examples/certtest/CMakeLists.txt @@ -2,5 +2,4 @@ set(certtest_bin_SRCS certtest.cpp) add_executable(certtest ${certtest_bin_SRCS}) -target_link_libraries( certtest ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY}) - +target_link_qca_libraries(certtest) diff --git a/examples/certtest/certtest.cpp b/examples/certtest/certtest.cpp index bfd73d34..abd9d77d 100644 --- a/examples/certtest/certtest.cpp +++ b/examples/certtest/certtest.cpp @@ -27,6 +27,10 @@ #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + // dump out information about some part of the certificate // we use this same approach for information about the subject // of the certificate, and also about the issuer of the certificate diff --git a/examples/ciphertest/CMakeLists.txt b/examples/ciphertest/CMakeLists.txt index 199408fe..9197188d 100644 --- a/examples/ciphertest/CMakeLists.txt +++ b/examples/ciphertest/CMakeLists.txt @@ -2,5 +2,4 @@ set(ciphertest_bin_SRCS ciphertest.cpp) add_executable(ciphertest ${ciphertest_bin_SRCS}) -target_link_libraries( ciphertest ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY}) - +target_link_qca_libraries(ciphertest) diff --git a/examples/ciphertest/ciphertest.cpp b/examples/ciphertest/ciphertest.cpp index 0baf09c1..448d9147 100644 --- a/examples/ciphertest/ciphertest.cpp +++ b/examples/ciphertest/ciphertest.cpp @@ -26,6 +26,10 @@ #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + int main(int argc, char **argv) { // the Initializer object sets things up, and diff --git a/examples/cms/CMakeLists.txt b/examples/cms/CMakeLists.txt index 97ce45df..73844227 100644 --- a/examples/cms/CMakeLists.txt +++ b/examples/cms/CMakeLists.txt @@ -2,5 +2,4 @@ set(cmsexample_bin_SRCS cmsexample.cpp) add_executable(cmsexample ${cmsexample_bin_SRCS}) -target_link_libraries( cmsexample ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY}) - +target_link_qca_libraries(cmsexample) diff --git a/examples/cms/cmsexample.cpp b/examples/cms/cmsexample.cpp index 6acf4f0a..2d8f54e8 100644 --- a/examples/cms/cmsexample.cpp +++ b/examples/cms/cmsexample.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + int main(int argc, char** argv) { // the Initializer object sets things up, and diff --git a/examples/cmssigner/main.cpp b/examples/cmssigner/main.cpp index 5ff03b7e..5afae6f7 100644 --- a/examples/cmssigner/main.cpp +++ b/examples/cmssigner/main.cpp @@ -31,6 +31,10 @@ #include "pkcs11configdlg/pkcs11configdlg.h" #include "certitem.h" +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + #define VERSION "1.0.0" class Icons diff --git a/examples/eventhandlerdemo/CMakeLists.txt b/examples/eventhandlerdemo/CMakeLists.txt index 29d8f2ac..07ad1ace 100644 --- a/examples/eventhandlerdemo/CMakeLists.txt +++ b/examples/eventhandlerdemo/CMakeLists.txt @@ -4,5 +4,4 @@ MY_AUTOMOC( eventhandlerdemo_bin_SRCS) add_executable(eventhandlerdemo ${eventhandlerdemo_bin_SRCS}) -target_link_libraries( eventhandlerdemo ${QCA_LIB_NAME} ${QT_QTCORE_LIBRARY}) - +target_link_qca_libraries(eventhandlerdemo) diff --git a/examples/eventhandlerdemo/eventhandlerdemo.cpp b/examples/eventhandlerdemo/eventhandlerdemo.cpp index 462334e9..aa1c844f 100644 --- a/examples/eventhandlerdemo/eventhandlerdemo.cpp +++ b/examples/eventhandlerdemo/eventhandlerdemo.cpp @@ -26,6 +26,10 @@ #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + /** We need a class on the client side to handle password requests. */ diff --git a/examples/hashtest/CMakeLists.txt b/examples/hashtest/CMakeLists.txt index ac93a097..890b0d8e 100644 --- a/examples/hashtest/CMakeLists.txt +++ b/examples/hashtest/CMakeLists.txt @@ -2,5 +2,4 @@ set(hashtest_bin_SRCS hashtest.cpp) add_executable(hashtest ${hashtest_bin_SRCS}) -target_link_libraries( hashtest ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY}) - +target_link_qca_libraries(hashtest) diff --git a/examples/hashtest/hashtest.cpp b/examples/hashtest/hashtest.cpp index e111caf7..7758e5c1 100644 --- a/examples/hashtest/hashtest.cpp +++ b/examples/hashtest/hashtest.cpp @@ -26,6 +26,10 @@ #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + int main(int argc, char **argv) { // the Initializer object sets things up, and diff --git a/examples/hextest/CMakeLists.txt b/examples/hextest/CMakeLists.txt index 6bc636d9..278d6e91 100644 --- a/examples/hextest/CMakeLists.txt +++ b/examples/hextest/CMakeLists.txt @@ -2,5 +2,4 @@ set(hextest_bin_SRCS hextest.cpp) add_executable(hextest ${hextest_bin_SRCS}) -target_link_libraries( hextest ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY}) - +target_link_qca_libraries(hextest) diff --git a/examples/hextest/hextest.cpp b/examples/hextest/hextest.cpp index 0bb63618..aa41704f 100644 --- a/examples/hextest/hextest.cpp +++ b/examples/hextest/hextest.cpp @@ -26,6 +26,10 @@ #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + int main(int argc, char **argv) { // the Initializer object sets things up, and diff --git a/examples/keyloader/CMakeLists.txt b/examples/keyloader/CMakeLists.txt index f4b3cfdf..38ec7aff 100644 --- a/examples/keyloader/CMakeLists.txt +++ b/examples/keyloader/CMakeLists.txt @@ -4,5 +4,4 @@ MY_AUTOMOC( keyloader_bin_SRCS ) add_executable(keyloader ${keyloader_bin_SRCS}) -target_link_libraries( keyloader ${QCA_LIB_NAME} ${QT_QTCORE_LIBRARY}) - +target_link_qca_libraries(keyloader) diff --git a/examples/keyloader/keyloader.cpp b/examples/keyloader/keyloader.cpp index 6588d5e9..b9f90dc0 100644 --- a/examples/keyloader/keyloader.cpp +++ b/examples/keyloader/keyloader.cpp @@ -27,6 +27,10 @@ #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class PassphraseHandler: public QObject { Q_OBJECT diff --git a/examples/mactest/CMakeLists.txt b/examples/mactest/CMakeLists.txt index 83cdf16d..2f61cb96 100644 --- a/examples/mactest/CMakeLists.txt +++ b/examples/mactest/CMakeLists.txt @@ -2,5 +2,4 @@ set(mactest_bin_SRCS mactest.cpp) add_executable(mactest ${mactest_bin_SRCS}) -target_link_libraries( mactest ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY}) - +target_link_qca_libraries(mactest) diff --git a/examples/mactest/mactest.cpp b/examples/mactest/mactest.cpp index 7c69c074..b3dc160b 100644 --- a/examples/mactest/mactest.cpp +++ b/examples/mactest/mactest.cpp @@ -28,6 +28,10 @@ // needed for printf #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + int main(int argc, char **argv) { // the Initializer object sets things up, and diff --git a/examples/md5crypt/CMakeLists.txt b/examples/md5crypt/CMakeLists.txt index b7b147cc..6bcf96b7 100644 --- a/examples/md5crypt/CMakeLists.txt +++ b/examples/md5crypt/CMakeLists.txt @@ -2,6 +2,6 @@ set(md5crypt_bin_SRCS md5crypt.cpp) add_executable(md5crypt ${md5crypt_bin_SRCS}) -#add "crypt" to the libs if you are trying the crypt() equivalent -target_link_libraries( md5crypt ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY}) +target_link_qca_libraries(md5crypt) +#add "crypt" to the libs if you are trying the crypt() equivalent diff --git a/examples/md5crypt/md5crypt.cpp b/examples/md5crypt/md5crypt.cpp index 52dd5857..80d3f60f 100644 --- a/examples/md5crypt/md5crypt.cpp +++ b/examples/md5crypt/md5crypt.cpp @@ -30,6 +30,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + QString to64 ( long v , int size ) { diff --git a/examples/providertest/CMakeLists.txt b/examples/providertest/CMakeLists.txt index 6755c842..c7b022c0 100644 --- a/examples/providertest/CMakeLists.txt +++ b/examples/providertest/CMakeLists.txt @@ -2,5 +2,4 @@ set(providertest_bin_SRCS providertest.cpp) add_executable(providertest ${providertest_bin_SRCS}) -target_link_libraries( providertest ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY}) - +target_link_qca_libraries(providertest) diff --git a/examples/providertest/providertest.cpp b/examples/providertest/providertest.cpp index 8f5c3c12..9d5def3d 100644 --- a/examples/providertest/providertest.cpp +++ b/examples/providertest/providertest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + int main(int argc, char **argv) { // the Initializer object sets things up, and diff --git a/examples/publickeyexample/CMakeLists.txt b/examples/publickeyexample/CMakeLists.txt index 5b9637b7..ed3074b5 100644 --- a/examples/publickeyexample/CMakeLists.txt +++ b/examples/publickeyexample/CMakeLists.txt @@ -2,5 +2,4 @@ set(publickeyexample_bin_SRCS publickeyexample.cpp) add_executable(publickeyexample ${publickeyexample_bin_SRCS}) -target_link_libraries( publickeyexample ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY}) - +target_link_qca_libraries(publickeyexample) diff --git a/examples/publickeyexample/publickeyexample.cpp b/examples/publickeyexample/publickeyexample.cpp index 4bfa8fda..7a58db2f 100644 --- a/examples/publickeyexample/publickeyexample.cpp +++ b/examples/publickeyexample/publickeyexample.cpp @@ -27,6 +27,9 @@ #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif int main(int argc, char** argv) { diff --git a/examples/randomtest/CMakeLists.txt b/examples/randomtest/CMakeLists.txt index f6c2d66c..608e47ef 100644 --- a/examples/randomtest/CMakeLists.txt +++ b/examples/randomtest/CMakeLists.txt @@ -2,5 +2,4 @@ set(randomtest_bin_SRCS randomtest.cpp) add_executable(randomtest ${randomtest_bin_SRCS}) -target_link_libraries( randomtest ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY}) - +target_link_qca_libraries(randomtest) diff --git a/examples/randomtest/randomtest.cpp b/examples/randomtest/randomtest.cpp index d5698470..c9dbed5d 100644 --- a/examples/randomtest/randomtest.cpp +++ b/examples/randomtest/randomtest.cpp @@ -27,6 +27,10 @@ #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + int main(int argc, char **argv) { // the Initializer object sets things up, and diff --git a/examples/rsatest/CMakeLists.txt b/examples/rsatest/CMakeLists.txt index 7a7249f7..d617cc4d 100644 --- a/examples/rsatest/CMakeLists.txt +++ b/examples/rsatest/CMakeLists.txt @@ -2,5 +2,4 @@ set(rsatest_bin_SRCS rsatest.cpp) add_executable(rsatest ${rsatest_bin_SRCS}) -target_link_libraries( rsatest ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY}) - +target_link_qca_libraries(rsatest) diff --git a/examples/rsatest/rsatest.cpp b/examples/rsatest/rsatest.cpp index 8e9d683f..b47f2921 100644 --- a/examples/rsatest/rsatest.cpp +++ b/examples/rsatest/rsatest.cpp @@ -25,6 +25,10 @@ #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + int main(int argc, char **argv) { // The Initializer object sets things up, and also diff --git a/examples/saslclient/CMakeLists.txt b/examples/saslclient/CMakeLists.txt index cf715705..b6929fad 100644 --- a/examples/saslclient/CMakeLists.txt +++ b/examples/saslclient/CMakeLists.txt @@ -4,4 +4,5 @@ MY_AUTOMOC( saslclient_bin_SRCS) add_executable(saslclient ${saslclient_bin_SRCS}) -target_link_libraries( saslclient ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY}) +target_link_qca_libraries(saslclient) +target_link_libraries(saslclient ${QT_QTNETWORK_LIBRARY}) diff --git a/examples/saslclient/saslclient.cpp b/examples/saslclient/saslclient.cpp index 3bbcbbd6..85f69ed1 100644 --- a/examples/saslclient/saslclient.cpp +++ b/examples/saslclient/saslclient.cpp @@ -29,6 +29,10 @@ // QtCrypto has the declarations for all of QCA #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + static QString prompt(const QString &s) { printf("* %s ", qPrintable(s)); diff --git a/examples/saslserver/CMakeLists.txt b/examples/saslserver/CMakeLists.txt index 72349f78..c929c9d2 100644 --- a/examples/saslserver/CMakeLists.txt +++ b/examples/saslserver/CMakeLists.txt @@ -4,4 +4,5 @@ MY_AUTOMOC( saslserver_bin_SRCS) add_executable(saslserver ${saslserver_bin_SRCS}) -target_link_libraries( saslserver ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY}) +target_link_qca_libraries(saslserver) +target_link_libraries(saslserver ${QT_QTNETWORK_LIBRARY}) diff --git a/examples/saslserver/saslserver.cpp b/examples/saslserver/saslserver.cpp index 6e121a46..9a69aae5 100644 --- a/examples/saslserver/saslserver.cpp +++ b/examples/saslserver/saslserver.cpp @@ -29,6 +29,10 @@ // QtCrypto has the declarations for all of QCA #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + static QString socketErrorToString(QAbstractSocket::SocketError x) { QString s; diff --git a/examples/sslservtest/CMakeLists.txt b/examples/sslservtest/CMakeLists.txt index 64c794f5..1172222b 100644 --- a/examples/sslservtest/CMakeLists.txt +++ b/examples/sslservtest/CMakeLists.txt @@ -4,5 +4,5 @@ MY_AUTOMOC( sslservtest_bin_SRCS ) add_executable(sslservtest ${sslservtest_bin_SRCS}) -target_link_libraries( sslservtest ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY}) - +target_link_qca_libraries(sslservtest) +target_link_libraries(sslservtest ${QT_QTNETWORK_LIBRARY}) diff --git a/examples/sslservtest/sslservtest.cpp b/examples/sslservtest/sslservtest.cpp index 016928b6..bed14acb 100644 --- a/examples/sslservtest/sslservtest.cpp +++ b/examples/sslservtest/sslservtest.cpp @@ -29,6 +29,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + char pemdata_cert[] = "-----BEGIN CERTIFICATE-----\n" "MIICeTCCAeKgAwIBAgIRAKKKnOj6Aarmwf0phApitVAwDQYJKoZIhvcNAQEFBQAw\n" diff --git a/examples/ssltest/CMakeLists.txt b/examples/ssltest/CMakeLists.txt index 10241c60..12da844f 100644 --- a/examples/ssltest/CMakeLists.txt +++ b/examples/ssltest/CMakeLists.txt @@ -1,9 +1,8 @@ set(ssltest_bin_SRCS ssltest.cpp) - MY_AUTOMOC( ssltest_bin_SRCS) add_executable(ssltest ${ssltest_bin_SRCS}) -target_link_libraries( ssltest ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY}) - +target_link_qca_libraries(ssltest) +target_link_libraries(ssltest ${QT_QTNETWORK_LIBRARY}) diff --git a/examples/ssltest/ssltest.cpp b/examples/ssltest/ssltest.cpp index 34f9bed5..de3a7c0e 100644 --- a/examples/ssltest/ssltest.cpp +++ b/examples/ssltest/ssltest.cpp @@ -24,6 +24,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + char exampleCA_cert[] = "-----BEGIN CERTIFICATE-----\n" "MIICSzCCAbSgAwIBAgIBADANBgkqhkiG9w0BAQUFADA4MRMwEQYDVQQDEwpFeGFt\n" diff --git a/examples/tlssocket/CMakeLists.txt b/examples/tlssocket/CMakeLists.txt index 750447c2..66216b05 100644 --- a/examples/tlssocket/CMakeLists.txt +++ b/examples/tlssocket/CMakeLists.txt @@ -1,10 +1,9 @@ set(tlssocket_bin_moc_SRCS tlssocket.cpp) set(tlssocket_bin_nonmoc_SRCS main.cpp) - MY_AUTOMOC( tlssocket_bin_moc_SRCS) add_executable(tlssocket ${tlssocket_bin_moc_SRCS} ${tlssocket_bin_nonmoc_SRCS}) -target_link_libraries( tlssocket ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY}) - +target_link_qca_libraries(tlssocket) +target_link_libraries(tlssocket ${QT_QTNETWORK_LIBRARY}) diff --git a/examples/tlssocket/tlssocket.cpp b/examples/tlssocket/tlssocket.cpp index 78ff489b..40564d36 100644 --- a/examples/tlssocket/tlssocket.cpp +++ b/examples/tlssocket/tlssocket.cpp @@ -21,6 +21,10 @@ #include "tlssocket.h" +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class TLSSocket::Private : public QObject { Q_OBJECT diff --git a/plugins/qca-botan/CMakeLists.txt b/plugins/qca-botan/CMakeLists.txt index 504a98cb..1e9981ff 100644 --- a/plugins/qca-botan/CMakeLists.txt +++ b/plugins/qca-botan/CMakeLists.txt @@ -10,7 +10,7 @@ if(BOTAN_FOUND) set(QCA_BOTAN_SOURCES qca-botan.cpp) add_definitions(${BOTAN_CFLAGS}) my_automoc(QCA_BOTAN_SOURCES) - add_library(qca-botan MODULE ${QCA_BOTAN_SOURCES}) + add_library(qca-botan ${PLUGIN_TYPE} ${QCA_BOTAN_SOURCES}) target_link_libraries(qca-botan ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME} ${BOTAN_LIBRARIES}) install(TARGETS qca-botan diff --git a/plugins/qca-cyrus-sasl/CMakeLists.txt b/plugins/qca-cyrus-sasl/CMakeLists.txt index 9a107e4a..3469174a 100644 --- a/plugins/qca-cyrus-sasl/CMakeLists.txt +++ b/plugins/qca-cyrus-sasl/CMakeLists.txt @@ -10,7 +10,7 @@ if(SASL2_FOUND) set(QCA_SASL_SOURCES qca-cyrus-sasl.cpp) include_directories( ${SASL2_INCLUDE_DIR} ) my_automoc( QCA_SASL_SOURCES ) - add_library(qca-cyrus-sasl MODULE ${QCA_SASL_SOURCES}) + add_library(qca-cyrus-sasl ${PLUGIN_TYPE} ${QCA_SASL_SOURCES}) target_link_libraries(qca-cyrus-sasl ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME} ${SASL2_LIBRARIES}) install(TARGETS qca-cyrus-sasl diff --git a/plugins/qca-gcrypt/CMakeLists.txt b/plugins/qca-gcrypt/CMakeLists.txt index 3d7d3d8c..d379d1f5 100644 --- a/plugins/qca-gcrypt/CMakeLists.txt +++ b/plugins/qca-gcrypt/CMakeLists.txt @@ -20,7 +20,7 @@ if(LIBGCRYPT_FOUND) set(QCA_GCRYPT_SOURCES qca-gcrypt.cpp) add_definitions(${LIBGCRYPT_CFLAGS}) my_automoc(QCA_GCRYPT_SOURCES) - add_library(qca-gcrypt MODULE ${QCA_GCRYPT_SOURCES}) + add_library(qca-gcrypt ${PLUGIN_TYPE} ${QCA_GCRYPT_SOURCES}) target_link_libraries(qca-gcrypt ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME} ${LIBGCRYPT_LIBRARIES}) install(TARGETS qca-gcrypt diff --git a/plugins/qca-gnupg/CMakeLists.txt b/plugins/qca-gnupg/CMakeLists.txt index fb4ad82b..d128b48d 100644 --- a/plugins/qca-gnupg/CMakeLists.txt +++ b/plugins/qca-gnupg/CMakeLists.txt @@ -13,7 +13,7 @@ if(QCA_GPG_EXECUTABLE) qt4_wrap_cpp(EXTRA_GNUPG_SOURCES gpgproc/gpgproc.h) qt4_wrap_cpp(EXTRA_GNUPG_SOURCES gpgproc/sprocess.h) - add_library(qca-gnupg MODULE ${QCA_GNUPG_MOC_SOURCES} gpgproc/sprocess.cpp ${EXTRA_GNUPG_SOURCES}) + add_library(qca-gnupg ${PLUGIN_TYPE} ${QCA_GNUPG_MOC_SOURCES} gpgproc/sprocess.cpp ${EXTRA_GNUPG_SOURCES}) include_directories(gpgproc) target_link_libraries(qca-gnupg ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME}) diff --git a/plugins/qca-logger/CMakeLists.txt b/plugins/qca-logger/CMakeLists.txt index 8cc4fc27..03025809 100644 --- a/plugins/qca-logger/CMakeLists.txt +++ b/plugins/qca-logger/CMakeLists.txt @@ -4,7 +4,7 @@ enable_plugin("logger") set(QCA_LOGGER_SOURCES qca-logger.cpp) my_automoc( QCA_LOGGER_SOURCES ) -add_library(qca-logger MODULE ${QCA_LOGGER_SOURCES}) +add_library(qca-logger ${PLUGIN_TYPE} ${QCA_LOGGER_SOURCES}) add_definitions(${LOGGERH_DEFINITIONS}) include_directories(${LOGGERH_INCLUDE_DIR}) diff --git a/plugins/qca-nss/CMakeLists.txt b/plugins/qca-nss/CMakeLists.txt index 16456aa0..39df1d27 100644 --- a/plugins/qca-nss/CMakeLists.txt +++ b/plugins/qca-nss/CMakeLists.txt @@ -11,7 +11,7 @@ if(NSS_FOUND) add_definitions(${NSS_DEFINITIONS}) include_directories(${NSS_INCLUDE_DIR}) my_automoc( QCA_NSS_SOURCES ) - add_library(qca-nss MODULE ${QCA_NSS_SOURCES}) + add_library(qca-nss ${PLUGIN_TYPE} ${QCA_NSS_SOURCES}) target_link_libraries(qca-nss ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME} ${NSS_LIBRARIES}) install(TARGETS qca-nss diff --git a/plugins/qca-ossl/CMakeLists.txt b/plugins/qca-ossl/CMakeLists.txt index 0d3436ca..cdba99fa 100644 --- a/plugins/qca-ossl/CMakeLists.txt +++ b/plugins/qca-ossl/CMakeLists.txt @@ -29,7 +29,7 @@ if(OPENSSL_FOUND) my_automoc( QCA_OSSL_SOURCES ) - add_library(qca-ossl MODULE ${QCA_OSSL_SOURCES}) + add_library(qca-ossl ${PLUGIN_TYPE} ${QCA_OSSL_SOURCES}) include_directories(${OPENSSL_INCLUDE_DIR}) target_link_libraries(qca-ossl ${QT_QTCORE_LIBRARY}) target_link_libraries(qca-ossl ${QCA_LIB_NAME}) diff --git a/plugins/qca-pkcs11/CMakeLists.txt b/plugins/qca-pkcs11/CMakeLists.txt index b14a15c5..d0379e90 100644 --- a/plugins/qca-pkcs11/CMakeLists.txt +++ b/plugins/qca-pkcs11/CMakeLists.txt @@ -13,7 +13,7 @@ if(OPENSSL_FOUND AND PKCS11H_FOUND) set(QCA_PKCS11_SOURCES qca-pkcs11.cpp) my_automoc( QCA_PKCS11_SOURCES ) - add_library(qca-pkcs11 MODULE ${QCA_PKCS11_SOURCES}) + add_library(qca-pkcs11 ${PLUGIN_TYPE} ${QCA_PKCS11_SOURCES}) add_definitions(${PKCS11H_DEFINITIONS}) include_directories(${PKCS11H_INCLUDE_DIR}) diff --git a/plugins/qca-softstore/CMakeLists.txt b/plugins/qca-softstore/CMakeLists.txt index abc4bdd7..d587d63d 100644 --- a/plugins/qca-softstore/CMakeLists.txt +++ b/plugins/qca-softstore/CMakeLists.txt @@ -4,7 +4,7 @@ enable_plugin("softstore") set(QCA_SOFTSTORE_SOURCES qca-softstore.cpp) my_automoc( QCA_SOFTSTORE_SOURCES ) -add_library(qca-softstore MODULE ${QCA_SOFTSTORE_SOURCES}) +add_library(qca-softstore ${PLUGIN_TYPE} ${QCA_SOFTSTORE_SOURCES}) add_definitions(${SOFTSTOREH_DEFINITIONS}) include_directories(${SOFTSTOREH_INCLUDE_DIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 037c9ffe..1825e210 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -129,7 +129,7 @@ qt4_wrap_cpp( SOURCES "${qca_INCLUDEDIR}/QtCrypto/qca_support.h") qt4_wrap_cpp( SOURCES "${qca_INCLUDEDIR}/QtCrypto/qpipe.h") qt4_wrap_cpp( SOURCES "qca_safeobj.h") -ADD_LIBRARY(${QCA_LIB_NAME} SHARED ${SOURCES}) +ADD_LIBRARY(${QCA_LIB_NAME} ${LIBRARY_TYPE} ${SOURCES}) TARGET_LINK_LIBRARIES(${QCA_LIB_NAME} ${QT_QTCORE_LIBRARY}) if(WIN32) diff --git a/tools/mozcerts/CMakeLists.txt b/tools/mozcerts/CMakeLists.txt index 4cfb141c..8c3c2f8e 100644 --- a/tools/mozcerts/CMakeLists.txt +++ b/tools/mozcerts/CMakeLists.txt @@ -5,6 +5,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") add_executable(${MOZCERTS_NAME} ${mozcerts_bin_SRCS}) -target_link_libraries( ${MOZCERTS_NAME} ${QCA_LIB_NAME} ${QT_QTGUI_LIBRARY}) +target_link_qca_libraries(${MOZCERTS_NAME}) install(TARGETS ${MOZCERTS_NAME} DESTINATION "${QCA_BINARY_INSTALL_DIR}") diff --git a/tools/qcatool/CMakeLists.txt b/tools/qcatool/CMakeLists.txt index 864483d0..9c3ba95a 100644 --- a/tools/qcatool/CMakeLists.txt +++ b/tools/qcatool/CMakeLists.txt @@ -9,6 +9,6 @@ set(qcatool_bin_SRCS ${qcatool_moc_SRCS}) add_executable(${QCA_TOOL_NAME} ${qcatool_bin_SRCS}) -target_link_libraries( ${QCA_TOOL_NAME} ${QCA_LIB_NAME} ${QT_QTCORE_LIBRARY}) +target_link_qca_libraries(${QCA_TOOL_NAME}) install(TARGETS ${QCA_TOOL_NAME} DESTINATION "${QCA_BINARY_INSTALL_DIR}") diff --git a/tools/qcatool/main.cpp b/tools/qcatool/main.cpp index 63f8b287..371c47ef 100644 --- a/tools/qcatool/main.cpp +++ b/tools/qcatool/main.cpp @@ -26,6 +26,11 @@ #include #include + +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + const char *const APPNAME = "qcatool"; const char *const EXENAME = "qcatool"; const char *const VERSION = "2.0.3"; diff --git a/unittest/base64unittest/CMakeLists.txt b/unittest/base64unittest/CMakeLists.txt index 3b72af4d..aee10477 100644 --- a/unittest/base64unittest/CMakeLists.txt +++ b/unittest/base64unittest/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( base64unittest_bin_SRCS ) add_executable(base64unittest ${base64unittest_bin_SRCS} ) -target_link_libraries( base64unittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(base64unittest) ADD_TEST(Base64 ${EXECUTABLE_OUTPUT_PATH}/base64unittest) diff --git a/unittest/base64unittest/base64unittest.cpp b/unittest/base64unittest/base64unittest.cpp index 12bfe8c9..8e332628 100644 --- a/unittest/base64unittest/base64unittest.cpp +++ b/unittest/base64unittest/base64unittest.cpp @@ -28,6 +28,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class Base64UnitTest : public QObject { Q_OBJECT diff --git a/unittest/bigintunittest/CMakeLists.txt b/unittest/bigintunittest/CMakeLists.txt index 8ae0070d..f6b5e3b8 100644 --- a/unittest/bigintunittest/CMakeLists.txt +++ b/unittest/bigintunittest/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( bigintunittest_bin_SRCS ) add_executable(bigintunittest ${bigintunittest_bin_SRCS} ) -target_link_libraries( bigintunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(bigintunittest) ADD_TEST("BigInteger" ${EXECUTABLE_OUTPUT_PATH}/bigintunittest) diff --git a/unittest/bigintunittest/bigintunittest.cpp b/unittest/bigintunittest/bigintunittest.cpp index 7f5e7648..51973662 100644 --- a/unittest/bigintunittest/bigintunittest.cpp +++ b/unittest/bigintunittest/bigintunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class BigIntUnitTest : public QObject { Q_OBJECT diff --git a/unittest/certunittest/CMakeLists.txt b/unittest/certunittest/CMakeLists.txt index 264c433d..04f21778 100644 --- a/unittest/certunittest/CMakeLists.txt +++ b/unittest/certunittest/CMakeLists.txt @@ -6,7 +6,8 @@ MY_AUTOMOC( certunittest_bin_SRCS ) add_executable(certunittest ${certunittest_bin_SRCS} ) -target_link_libraries( certunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(certunittest) + FOREACH( testFileName RootCAcert.pem 76.pem altname.pem csr1.pem GoodCACRL.pem ov-root-ca-cert.crt User.pem QcaTestClientCert.pem xmppcert.pem diff --git a/unittest/certunittest/certunittest.cpp b/unittest/certunittest/certunittest.cpp index 331c94b8..c4b82d9d 100644 --- a/unittest/certunittest/certunittest.cpp +++ b/unittest/certunittest/certunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class CertUnitTest : public QObject { Q_OBJECT diff --git a/unittest/cipherunittest/CMakeLists.txt b/unittest/cipherunittest/CMakeLists.txt index c7293052..defe3b1d 100644 --- a/unittest/cipherunittest/CMakeLists.txt +++ b/unittest/cipherunittest/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( cipherunittest_bin_SRCS ) add_executable(cipherunittest ${cipherunittest_bin_SRCS} ) -target_link_libraries( cipherunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(cipherunittest) ADD_TEST( SymmetricCipher ${EXECUTABLE_OUTPUT_PATH}/cipherunittest) diff --git a/unittest/cipherunittest/cipherunittest.cpp b/unittest/cipherunittest/cipherunittest.cpp index 4068c5be..8d20a472 100644 --- a/unittest/cipherunittest/cipherunittest.cpp +++ b/unittest/cipherunittest/cipherunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class CipherUnitTest : public QObject { diff --git a/unittest/clientplugin/CMakeLists.txt b/unittest/clientplugin/CMakeLists.txt index 6ee862d3..61949fdc 100644 --- a/unittest/clientplugin/CMakeLists.txt +++ b/unittest/clientplugin/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( clientplugin_bin_SRCS ) add_executable(clientplugin ${clientplugin_bin_SRCS} ) -target_link_libraries( clientplugin ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(clientplugin) ADD_TEST(ClientSidePlugin ${EXECUTABLE_OUTPUT_PATH}/clientplugin) diff --git a/unittest/clientplugin/clientplugin.cpp b/unittest/clientplugin/clientplugin.cpp index e6ff5738..f74aed30 100644 --- a/unittest/clientplugin/clientplugin.cpp +++ b/unittest/clientplugin/clientplugin.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class ClientPlugin : public QObject { Q_OBJECT diff --git a/unittest/cms/CMakeLists.txt b/unittest/cms/CMakeLists.txt index d8c33412..c82f0348 100644 --- a/unittest/cms/CMakeLists.txt +++ b/unittest/cms/CMakeLists.txt @@ -6,7 +6,7 @@ MY_AUTOMOC( cms_bin_SRCS ) add_executable(cms ${cms_bin_SRCS} ) -target_link_libraries( cms ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(cms) FOREACH( testFileName QcaTestRootCert.pem QcaTestClientCert.pem QcaTestClientKey.pem ) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${testFileName} ${CMAKE_CURRENT_BINARY_DIR}/${testFileName} COPYONLY) diff --git a/unittest/cms/cms.cpp b/unittest/cms/cms.cpp index a5a62819..da378bab 100644 --- a/unittest/cms/cms.cpp +++ b/unittest/cms/cms.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class CMSut : public QObject { diff --git a/unittest/dsaunittest/CMakeLists.txt b/unittest/dsaunittest/CMakeLists.txt index ae163f98..164183e6 100644 --- a/unittest/dsaunittest/CMakeLists.txt +++ b/unittest/dsaunittest/CMakeLists.txt @@ -6,7 +6,6 @@ MY_AUTOMOC( dsaunittest_bin_SRCS ) add_executable( dsaunittest ${dsaunittest_bin_SRCS} ) -target_link_libraries( dsaunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(dsaunittest) ADD_TEST(DigitalSignatureAlgorithm ${EXECUTABLE_OUTPUT_PATH}/dsaunittest) - diff --git a/unittest/dsaunittest/dsaunittest.cpp b/unittest/dsaunittest/dsaunittest.cpp index 3630f8d1..44c6ba6e 100644 --- a/unittest/dsaunittest/dsaunittest.cpp +++ b/unittest/dsaunittest/dsaunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class DSAUnitTest : public QObject { Q_OBJECT diff --git a/unittest/filewatchunittest/CMakeLists.txt b/unittest/filewatchunittest/CMakeLists.txt index bdda501b..42fd59d3 100644 --- a/unittest/filewatchunittest/CMakeLists.txt +++ b/unittest/filewatchunittest/CMakeLists.txt @@ -6,7 +6,6 @@ MY_AUTOMOC( filewatchunittest_bin_SRCS ) add_executable( filewatchunittest ${filewatchunittest_bin_SRCS} ) -target_link_libraries( filewatchunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(filewatchunittest) ADD_TEST(FileWatch ${EXECUTABLE_OUTPUT_PATH}/filewatchunittest) - diff --git a/unittest/filewatchunittest/filewatchunittest.cpp b/unittest/filewatchunittest/filewatchunittest.cpp index 9c48f909..9a8bf7da 100644 --- a/unittest/filewatchunittest/filewatchunittest.cpp +++ b/unittest/filewatchunittest/filewatchunittest.cpp @@ -24,6 +24,10 @@ */ #include "filewatchunittest.h" +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + void FileWatchUnitTest::initTestCase() { m_init = new QCA::Initializer; diff --git a/unittest/hashunittest/CMakeLists.txt b/unittest/hashunittest/CMakeLists.txt index 6dba27d2..afadeedb 100644 --- a/unittest/hashunittest/CMakeLists.txt +++ b/unittest/hashunittest/CMakeLists.txt @@ -6,7 +6,8 @@ MY_AUTOMOC( hashunittest_bin_SRCS ) add_executable( hashunittest ${hashunittest_bin_SRCS} ) -target_link_libraries( hashunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(hashunittest) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/empty ${CMAKE_CURRENT_BINARY_DIR}/data/empty COPYONLY) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/twobytes ${CMAKE_CURRENT_BINARY_DIR}/data/twobytes COPYONLY) diff --git a/unittest/hashunittest/hashunittest.cpp b/unittest/hashunittest/hashunittest.cpp index a5b0e083..c18864d9 100644 --- a/unittest/hashunittest/hashunittest.cpp +++ b/unittest/hashunittest/hashunittest.cpp @@ -27,6 +27,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class HashUnitTest : public QObject { Q_OBJECT diff --git a/unittest/hexunittest/CMakeLists.txt b/unittest/hexunittest/CMakeLists.txt index 60c463bd..dd4fbe7e 100644 --- a/unittest/hexunittest/CMakeLists.txt +++ b/unittest/hexunittest/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( hexunittest_bin_SRCS ) add_executable( hexunittest ${hexunittest_bin_SRCS} ) -target_link_libraries( hexunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(hexunittest) ADD_TEST(HexadecimalConversion ${EXECUTABLE_OUTPUT_PATH}/hexunittest) diff --git a/unittest/hexunittest/hexunittest.cpp b/unittest/hexunittest/hexunittest.cpp index 88e64310..6a020a9c 100644 --- a/unittest/hexunittest/hexunittest.cpp +++ b/unittest/hexunittest/hexunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class HexUnitTest : public QObject { Q_OBJECT diff --git a/unittest/kdfunittest/CMakeLists.txt b/unittest/kdfunittest/CMakeLists.txt index f6400dfa..bc7ed40a 100644 --- a/unittest/kdfunittest/CMakeLists.txt +++ b/unittest/kdfunittest/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( kdfunittest_bin_SRCS ) add_executable( kdfunittest ${kdfunittest_bin_SRCS} ) -target_link_libraries( kdfunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(kdfunittest) ADD_TEST(KeyDerivationFunction ${EXECUTABLE_OUTPUT_PATH}/kdfunittest) diff --git a/unittest/kdfunittest/kdfunittest.cpp b/unittest/kdfunittest/kdfunittest.cpp index 55a9e9a5..4199eda7 100644 --- a/unittest/kdfunittest/kdfunittest.cpp +++ b/unittest/kdfunittest/kdfunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class KDFUnitTest : public QObject { Q_OBJECT diff --git a/unittest/keybundle/CMakeLists.txt b/unittest/keybundle/CMakeLists.txt index 20ba1b24..7bf3501e 100644 --- a/unittest/keybundle/CMakeLists.txt +++ b/unittest/keybundle/CMakeLists.txt @@ -6,8 +6,7 @@ MY_AUTOMOC( keybundleunittest_bin_SRCS ) add_executable( keybundle ${keybundleunittest_bin_SRCS} ) -target_link_libraries( keybundle ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) - +target_link_qca_test_libraries(keybundle) FOREACH( testFileName RootCA2cert.pem servergood2.p12 user2goodcert.pem user2goodkey.pem user2good.p12 ) diff --git a/unittest/keybundle/keybundle.cpp b/unittest/keybundle/keybundle.cpp index 8ffb0a1d..d666100e 100644 --- a/unittest/keybundle/keybundle.cpp +++ b/unittest/keybundle/keybundle.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class KeyBundleTest : public QObject { Q_OBJECT diff --git a/unittest/keygenunittest/CMakeLists.txt b/unittest/keygenunittest/CMakeLists.txt index 666513c9..d566b2ee 100644 --- a/unittest/keygenunittest/CMakeLists.txt +++ b/unittest/keygenunittest/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( keygenunittest_bin_SRCS ) add_executable( keygenunittest ${keygenunittest_bin_SRCS} ) -target_link_libraries( keygenunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(keygenunittest) ADD_TEST(KeyGeneration ${EXECUTABLE_OUTPUT_PATH}/keygenunittest) diff --git a/unittest/keygenunittest/keygenunittest.cpp b/unittest/keygenunittest/keygenunittest.cpp index 9d8bec03..9478db20 100644 --- a/unittest/keygenunittest/keygenunittest.cpp +++ b/unittest/keygenunittest/keygenunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class KeyGenUnitTest : public QObject { Q_OBJECT diff --git a/unittest/keylengthunittest/CMakeLists.txt b/unittest/keylengthunittest/CMakeLists.txt index 2c538183..1256591c 100644 --- a/unittest/keylengthunittest/CMakeLists.txt +++ b/unittest/keylengthunittest/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( keylengthunittest_bin_SRCS ) add_executable( keylengthunittest ${keylengthunittest_bin_SRCS} ) -target_link_libraries( keylengthunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(keylengthunittest) ADD_TEST(KeyLength ${EXECUTABLE_OUTPUT_PATH}/keylengthunittest) diff --git a/unittest/keylengthunittest/keylengthunittest.cpp b/unittest/keylengthunittest/keylengthunittest.cpp index 90c84a52..3e93b773 100644 --- a/unittest/keylengthunittest/keylengthunittest.cpp +++ b/unittest/keylengthunittest/keylengthunittest.cpp @@ -28,6 +28,10 @@ #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class KeyLengthUnitTest : public QObject { Q_OBJECT diff --git a/unittest/keystore/CMakeLists.txt b/unittest/keystore/CMakeLists.txt index 48f020e9..8b233add 100644 --- a/unittest/keystore/CMakeLists.txt +++ b/unittest/keystore/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( keystoreunittest_bin_SRCS ) add_executable( keystore ${keystoreunittest_bin_SRCS} ) -target_link_libraries( keystore ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(keystore) ADD_TEST(KeyStore ${EXECUTABLE_OUTPUT_PATH}/keystore) diff --git a/unittest/keystore/keystore.cpp b/unittest/keystore/keystore.cpp index df66a1a1..fd273f10 100644 --- a/unittest/keystore/keystore.cpp +++ b/unittest/keystore/keystore.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class KeyStore : public QObject { Q_OBJECT diff --git a/unittest/logger/CMakeLists.txt b/unittest/logger/CMakeLists.txt index 38cecd6b..b3ae3bb8 100644 --- a/unittest/logger/CMakeLists.txt +++ b/unittest/logger/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( loggerunittest_bin_SRCS ) add_executable(loggerunittest ${loggerunittest_bin_SRCS} ) -target_link_libraries( loggerunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(loggerunittest) ADD_TEST(Logger ${EXECUTABLE_OUTPUT_PATH}/loggerunittest) diff --git a/unittest/logger/loggerunittest.cpp b/unittest/logger/loggerunittest.cpp index 73b6b362..755b2a54 100644 --- a/unittest/logger/loggerunittest.cpp +++ b/unittest/logger/loggerunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class LoggerUnitTest : public QObject { Q_OBJECT diff --git a/unittest/macunittest/CMakeLists.txt b/unittest/macunittest/CMakeLists.txt index 11109343..93c797e1 100644 --- a/unittest/macunittest/CMakeLists.txt +++ b/unittest/macunittest/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( macunittest_bin_SRCS ) add_executable( macunittest ${macunittest_bin_SRCS} ) -target_link_libraries( macunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(macunittest) ADD_TEST(MessageAuthenticationCode ${EXECUTABLE_OUTPUT_PATH}/macunittest) diff --git a/unittest/macunittest/macunittest.cpp b/unittest/macunittest/macunittest.cpp index 79f55da5..2d2f3833 100644 --- a/unittest/macunittest/macunittest.cpp +++ b/unittest/macunittest/macunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class MACUnitTest : public QObject { Q_OBJECT diff --git a/unittest/metatype/CMakeLists.txt b/unittest/metatype/CMakeLists.txt index 84447c07..9f057bf5 100644 --- a/unittest/metatype/CMakeLists.txt +++ b/unittest/metatype/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( metatype_bin_SRCS ) add_executable( metatypeunittest ${metatype_bin_SRCS} ) -target_link_libraries( metatypeunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(metatypeunittest) ADD_TEST(MetaTypeUnittest ${EXECUTABLE_OUTPUT_PATH}/metatypeunittest) diff --git a/unittest/metatype/metatype.cpp b/unittest/metatype/metatype.cpp index 1502cf6c..e6305aad 100644 --- a/unittest/metatype/metatype.cpp +++ b/unittest/metatype/metatype.cpp @@ -28,6 +28,10 @@ #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class TestClass1 : public QObject { Q_OBJECT diff --git a/unittest/pgpunittest/CMakeLists.txt b/unittest/pgpunittest/CMakeLists.txt index dd935aea..7c2d1b23 100644 --- a/unittest/pgpunittest/CMakeLists.txt +++ b/unittest/pgpunittest/CMakeLists.txt @@ -6,7 +6,8 @@ MY_AUTOMOC( pgpunittest_bin_SRCS ) add_executable(pgpunittest ${pgpunittest_bin_SRCS} ) -target_link_libraries( pgpunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY} ) +target_link_qca_test_libraries(pgpunittest) + FOREACH( testFileName pubring.gpg secring.gpg trustdb.gpg ) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/keys1/${testFileName} ${CMAKE_CURRENT_BINARY_DIR}/keys1/${testFileName} COPYONLY) diff --git a/unittest/pgpunittest/pgpunittest.cpp b/unittest/pgpunittest/pgpunittest.cpp index 1fb77150..e2c79671 100644 --- a/unittest/pgpunittest/pgpunittest.cpp +++ b/unittest/pgpunittest/pgpunittest.cpp @@ -28,6 +28,10 @@ #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + // qt did not introduce qputenv until 4.4, so we'll keep a copy here for 4.2 // compat bool my_qputenv(const char *varName, const QByteArray& value) diff --git a/unittest/pipeunittest/CMakeLists.txt b/unittest/pipeunittest/CMakeLists.txt index f4f55a84..35fc4167 100644 --- a/unittest/pipeunittest/CMakeLists.txt +++ b/unittest/pipeunittest/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( pipeunittest_bin_SRCS ) add_executable( pipeunittest ${pipeunittest_bin_SRCS} ) -target_link_libraries( pipeunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(pipeunittest) # ADD_TEST(QPipe ${EXECUTABLE_OUTPUT_PATH}/pipeunittest) diff --git a/unittest/pipeunittest/pipeunittest.cpp b/unittest/pipeunittest/pipeunittest.cpp index 824e6b5b..9502c293 100644 --- a/unittest/pipeunittest/pipeunittest.cpp +++ b/unittest/pipeunittest/pipeunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class PipeUnitTest : public QObject { Q_OBJECT diff --git a/unittest/pkits/CMakeLists.txt b/unittest/pkits/CMakeLists.txt index 9ece104f..493af07a 100644 --- a/unittest/pkits/CMakeLists.txt +++ b/unittest/pkits/CMakeLists.txt @@ -6,7 +6,8 @@ MY_AUTOMOC( pkits_bin_SRCS ) add_executable(pkits ${pkits_bin_SRCS} ) -target_link_libraries( pkits ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(pkits) + FOREACH( testFileName BadnotAfterDateCACert.crt RFC3280MandatoryAttributeTypesCACRL.crl BadnotAfterDateCACRL.crl RFC3280OptionalAttributeTypesCACert.crt BadnotBeforeDateCACert.crt RFC3280OptionalAttributeTypesCACRL.crl diff --git a/unittest/pkits/pkits.cpp b/unittest/pkits/pkits.cpp index 7d734749..2faa0124 100644 --- a/unittest/pkits/pkits.cpp +++ b/unittest/pkits/pkits.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class Pkits : public QObject { Q_OBJECT diff --git a/unittest/rsaunittest/CMakeLists.txt b/unittest/rsaunittest/CMakeLists.txt index 8d1dd713..d246fe02 100644 --- a/unittest/rsaunittest/CMakeLists.txt +++ b/unittest/rsaunittest/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( rsaunittest_bin_SRCS ) add_executable(rsaunittest ${rsaunittest_bin_SRCS} ) -target_link_libraries( rsaunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(rsaunittest) ADD_TEST(RSA ${EXECUTABLE_OUTPUT_PATH}/rsaunittest) diff --git a/unittest/rsaunittest/rsaunittest.cpp b/unittest/rsaunittest/rsaunittest.cpp index 0424e684..c9b30b0f 100644 --- a/unittest/rsaunittest/rsaunittest.cpp +++ b/unittest/rsaunittest/rsaunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class RSAUnitTest : public QObject { Q_OBJECT diff --git a/unittest/securearrayunittest/CMakeLists.txt b/unittest/securearrayunittest/CMakeLists.txt index 5bb30ab7..4d4f3609 100644 --- a/unittest/securearrayunittest/CMakeLists.txt +++ b/unittest/securearrayunittest/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( securearrayunittest_bin_SRCS ) add_executable( securearrayunittest ${securearrayunittest_bin_SRCS} ) -target_link_libraries( securearrayunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(securearrayunittest) ADD_TEST(SecureArray ${EXECUTABLE_OUTPUT_PATH}/securearrayunittest) diff --git a/unittest/securearrayunittest/securearrayunittest.cpp b/unittest/securearrayunittest/securearrayunittest.cpp index 16f5a3bb..d5ccf5bb 100644 --- a/unittest/securearrayunittest/securearrayunittest.cpp +++ b/unittest/securearrayunittest/securearrayunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class SecureArrayUnitTest : public QObject { Q_OBJECT diff --git a/unittest/staticunittest/CMakeLists.txt b/unittest/staticunittest/CMakeLists.txt index 483a55b6..589c7ff4 100644 --- a/unittest/staticunittest/CMakeLists.txt +++ b/unittest/staticunittest/CMakeLists.txt @@ -6,7 +6,6 @@ MY_AUTOMOC( staticunittest_bin_SRCS ) add_executable( staticunittest ${staticunittest_bin_SRCS} ) -target_link_libraries( staticunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(staticunittest) ADD_TEST(StaticFunctions ${EXECUTABLE_OUTPUT_PATH}/staticunittest) - diff --git a/unittest/staticunittest/staticunittest.cpp b/unittest/staticunittest/staticunittest.cpp index dfa5374d..af5ce19a 100644 --- a/unittest/staticunittest/staticunittest.cpp +++ b/unittest/staticunittest/staticunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class StaticUnitTest : public QObject { Q_OBJECT diff --git a/unittest/symmetrickeyunittest/CMakeLists.txt b/unittest/symmetrickeyunittest/CMakeLists.txt index 27c74d95..09a7a14a 100644 --- a/unittest/symmetrickeyunittest/CMakeLists.txt +++ b/unittest/symmetrickeyunittest/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( symmetrickeyunittest_bin_SRCS ) add_executable( symmetrickeyunittest ${symmetrickeyunittest_bin_SRCS} ) -target_link_libraries( symmetrickeyunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(symmetrickeyunittest) ADD_TEST(SymmetricKey ${EXECUTABLE_OUTPUT_PATH}/symmetrickeyunittest) diff --git a/unittest/symmetrickeyunittest/symmetrickeyunittest.cpp b/unittest/symmetrickeyunittest/symmetrickeyunittest.cpp index 103ac682..27277e5f 100644 --- a/unittest/symmetrickeyunittest/symmetrickeyunittest.cpp +++ b/unittest/symmetrickeyunittest/symmetrickeyunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class SymmetricKeyUnitTest : public QObject { Q_OBJECT diff --git a/unittest/tls/CMakeLists.txt b/unittest/tls/CMakeLists.txt index a87776bc..2f3ed29c 100644 --- a/unittest/tls/CMakeLists.txt +++ b/unittest/tls/CMakeLists.txt @@ -6,6 +6,6 @@ MY_AUTOMOC( tlsunittest_bin_SRCS ) add_executable(tlsunittest ${tlsunittest_bin_SRCS} ) -target_link_libraries( tlsunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY}) +target_link_qca_test_libraries(tlsunittest) ADD_TEST(TransportLayerSecurity ${EXECUTABLE_OUTPUT_PATH}/tlsunittest) diff --git a/unittest/tls/tlsunittest.cpp b/unittest/tls/tlsunittest.cpp index 3cdff96a..4eaf4c89 100644 --- a/unittest/tls/tlsunittest.cpp +++ b/unittest/tls/tlsunittest.cpp @@ -26,6 +26,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class TLSUnitTest : public QObject { Q_OBJECT diff --git a/unittest/velox/CMakeLists.txt b/unittest/velox/CMakeLists.txt index 631e92ca..bfb3f680 100644 --- a/unittest/velox/CMakeLists.txt +++ b/unittest/velox/CMakeLists.txt @@ -6,7 +6,8 @@ MY_AUTOMOC( veloxunittest_bin_SRCS ) add_executable(veloxunittest ${veloxunittest_bin_SRCS} ) -target_link_libraries( veloxunittest ${QCA_LIB_NAME} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) +target_link_qca_test_libraries(veloxunittest) +target_link_libraries(veloxunittest ${QT_QTNETWORK_LIBRARY}) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/root.crt ${CMAKE_CURRENT_BINARY_DIR}/root.crt COPYONLY) diff --git a/unittest/velox/veloxunittest.cpp b/unittest/velox/veloxunittest.cpp index a9eed1a5..d88f038c 100644 --- a/unittest/velox/veloxunittest.cpp +++ b/unittest/velox/veloxunittest.cpp @@ -27,6 +27,10 @@ #include #include +#ifdef QT_STATICPLUGIN +#include "import_plugins.h" +#endif + class TlsTest : public QObject { Q_OBJECT