cmake: fixed QCA_PLUGINS_INSTALL_DIR meaning

Plugins must be in crypto subdir. It is used internally in providers finding algorythm. So now QCA_PLUGINS_INSTALL_DIR it is path to crypto directory.
2025-04-28 04:24:32 +00:00 · 2014-09-24 16:00:39 +06:00 · 2014-09-24 16:00:39 +06:00 · 192243d4bd
commit 192243d4bd
parent 2950458c77
11 changed files with 43 additions and 41 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -145,7 +145,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" )

 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_PLUGINS_INSTALL_DIR "${QT_PLUGINS_DIR}" 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")
@ -160,7 +160,7 @@ else( QCA_INSTALL_IN_QT_PREFIX )
  set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "Directory where lib will install")

  set(QCA_PREFIX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Directory where qca will install")
-  set(QCA_PLUGINS_INSTALL_DIR "${LIB_INSTALL_DIR}/${QCA_LIB_NAME}/crypto" CACHE PATH "Directory where qca plugins will install")
+  set(QCA_PLUGINS_INSTALL_DIR "${LIB_INSTALL_DIR}/${QCA_LIB_NAME}" 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")
@ -305,6 +305,8 @@ install(FILES "${CMAKE_BINARY_DIR}/crypto.prf" DESTINATION "${QCA_FEATURE_INSTAL
 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")

+set(QCA_CRYPTO_INSTALL_DIR "${QCA_PLUGINS_INSTALL_DIR}/crypto")
+
 add_subdirectory(src)
 add_subdirectory(plugins)

--- a/plugins/qca-botan/CMakeLists.txt
+++ b/plugins/qca-botan/CMakeLists.txt
@ -14,11 +14,11 @@ if(BOTAN_FOUND)
  target_link_libraries(qca-botan ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME} ${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_CRYPTO_INSTALL_DIR}"
+          ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+          RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}")

-  install_pdb(qca-botan ${QCA_PLUGINS_INSTALL_DIR})
+  install_pdb(qca-botan ${QCA_CRYPTO_INSTALL_DIR})
 else(BOTAN_FOUND)
  disable_plugin("botan")
 endif(BOTAN_FOUND)
--- a/plugins/qca-cyrus-sasl/CMakeLists.txt
+++ b/plugins/qca-cyrus-sasl/CMakeLists.txt
@ -14,11 +14,11 @@ if(SASL2_FOUND)
  target_link_libraries(qca-cyrus-sasl ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME} ${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_CRYPTO_INSTALL_DIR}"
+          ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+          RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}")

-  install_pdb(qca-cyrus-sasl ${QCA_PLUGINS_INSTALL_DIR})
+  install_pdb(qca-cyrus-sasl ${QCA_CRYPTO_INSTALL_DIR})
 else(SASL2_FOUND)
  disable_plugin("cyrus-sasl")
 endif(SASL2_FOUND)
--- a/plugins/qca-gcrypt/CMakeLists.txt
+++ b/plugins/qca-gcrypt/CMakeLists.txt
@ -24,11 +24,11 @@ if(LIBGCRYPT_FOUND)
    target_link_libraries(qca-gcrypt ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME} ${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_CRYPTO_INSTALL_DIR}"
+            ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+            RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}")

-    install_pdb(qca-gcrypt ${QCA_PLUGINS_INSTALL_DIR})
+    install_pdb(qca-gcrypt ${QCA_CRYPTO_INSTALL_DIR})
  else(HAVE_GCRY_ERROR_T)
    message(STATUS "libgcrypt seems to be too old")
    disable_plugin("gcrypt")
--- a/plugins/qca-gnupg/CMakeLists.txt
+++ b/plugins/qca-gnupg/CMakeLists.txt
@ -22,11 +22,11 @@ if(QCA_GPG_EXECUTABLE)
  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_CRYPTO_INSTALL_DIR}"
+          ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+          RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}")

-  install_pdb(qca-gnupg ${QCA_PLUGINS_INSTALL_DIR})
+  install_pdb(qca-gnupg ${QCA_CRYPTO_INSTALL_DIR})
 elseif(WITH_gnupg_PLUGIN STREQUAL "yes")
  message(FATAL_ERROR "Could not find GnuPG binary")
 else(QCA_GPG_EXECUTABLE)
--- a/plugins/qca-logger/CMakeLists.txt
+++ b/plugins/qca-logger/CMakeLists.txt
@ -12,8 +12,8 @@ target_link_libraries(qca-logger ${QT_QTCORE_LIBRARY})
 target_link_libraries(qca-logger ${QCA_LIB_NAME})

 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_CRYPTO_INSTALL_DIR}"
+        ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+        RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}")

-install_pdb(qca-logger ${QCA_PLUGINS_INSTALL_DIR})
+install_pdb(qca-logger ${QCA_CRYPTO_INSTALL_DIR})
--- a/plugins/qca-nss/CMakeLists.txt
+++ b/plugins/qca-nss/CMakeLists.txt
@ -15,11 +15,11 @@ if(NSS_FOUND)
  target_link_libraries(qca-nss ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME} ${NSS_LDFLAGS})

  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_CRYPTO_INSTALL_DIR}"
+          ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+          RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}")

-  install_pdb(qca-nss ${QCA_PLUGINS_INSTALL_DIR})
+  install_pdb(qca-nss ${QCA_CRYPTO_INSTALL_DIR})
 else(NSS_FOUND)
  disable_plugin("nss")
  set(WITH_nss_PLUGIN "no" PARENT_SCOPE)
--- a/plugins/qca-ossl/CMakeLists.txt
+++ b/plugins/qca-ossl/CMakeLists.txt
@ -47,11 +47,11 @@ if(OPENSSL_FOUND)
  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_CRYPTO_INSTALL_DIR}"
+          ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+          RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}")

-  install_pdb(qca-ossl ${QCA_PLUGINS_INSTALL_DIR})
+  install_pdb(qca-ossl ${QCA_CRYPTO_INSTALL_DIR})
 else(OPENSSL_FOUND)
  disable_plugin("ossl")
 endif(OPENSSL_FOUND)
--- a/plugins/qca-pkcs11/CMakeLists.txt
+++ b/plugins/qca-pkcs11/CMakeLists.txt
@ -25,11 +25,11 @@ if(OPENSSL_FOUND AND PKCS11H_FOUND)
  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_CRYPTO_INSTALL_DIR}"
+          ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+          RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}")

-  install_pdb(qca-pkcs11 ${QCA_PLUGINS_INSTALL_DIR})
+  install_pdb(qca-pkcs11 ${QCA_CRYPTO_INSTALL_DIR})
 else(OPENSSL_FOUND AND PKCS11H_FOUND)
  disable_plugin("pkcs11")
 endif(OPENSSL_FOUND AND PKCS11H_FOUND)
--- a/plugins/qca-softstore/CMakeLists.txt
+++ b/plugins/qca-softstore/CMakeLists.txt
@ -12,8 +12,8 @@ target_link_libraries(qca-softstore ${QT_QTCORE_LIBRARY})
 target_link_libraries(qca-softstore ${QCA_LIB_NAME})

 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_CRYPTO_INSTALL_DIR}"
+        ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+        RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}")

-install_pdb(qca-softstore ${QCA_PLUGINS_INSTALL_DIR})
+install_pdb(qca-softstore ${QCA_CRYPTO_INSTALL_DIR})
--- a/plugins/qca-wincrypto/CMakeLists.txt
+++ b/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_CRYPTO_INSTALL_DIR}"
+        ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+        RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
   )
 ENDIF (WIN32)