0001-fix-path-for-vcpkg.patch 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172
  1. diff --git "a/CMakeLists.txt" "b/CMakeLists.txt"
  2. index 1f84c2c9e..f72ee9d8d 100644
  3. --- "a/CMakeLists.txt"
  4. +++ "b/CMakeLists.txt"
  5. @@ -58,6 +58,7 @@ set(QCA_SUFFIX "qt5")
  6. if(NOT BUILD_SHARED_LIBS OR QT_IS_STATIC)
  7. set(STATIC_PLUGINS ON)
  8. add_definitions(-DQT_STATICPLUGIN)
  9. + add_definitions(-DQCA_STATIC)
  10. set(PLUGIN_TYPE "STATIC")
  11. else()
  12. set(PLUGIN_TYPE "MODULE")
  13. @@ -266,10 +267,17 @@ if(DEVELOPER_MODE)
  14. add_definitions(-DDEVELOPER_MODE)
  15. # To prefer plugins from build tree when run qca from build tree
  16. - file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf
  17. -"[Paths]
  18. -Plugins=${CMAKE_BINARY_DIR}/lib/${QCA_LIB_NAME}
  19. -")
  20. + if(NOT BUILD_SHARED_LIBS OR QT_IS_STATIC)
  21. + file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf
  22. + "[Paths]
  23. + Plugins=${CMAKE_BINARY_DIR}/lib/${QCA_LIB_NAME}
  24. + ")
  25. + else()
  26. + file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf
  27. + "[Paths]
  28. + Plugins=${CMAKE_BINARY_DIR}/bin/${QCA_LIB_NAME}
  29. + ")
  30. + endif()
  31. endif()
  32. if (APPLE)
  33. @@ -309,7 +317,7 @@ else()
  34. set( qca_CERTSTORE "${CMAKE_CURRENT_SOURCE_DIR}/certs/rootcerts.pem")
  35. # note that INSTALL_FILES targets are relative to the current installation prefix...
  36. if(NOT DEVELOPER_MODE)
  37. - install(FILES "${qca_CERTSTORE}" DESTINATION "${QCA_PREFIX_INSTALL_DIR}/certs")
  38. + install(FILES "${qca_CERTSTORE}" DESTINATION "${QCA_PREFIX_INSTALL_DIR}/share/qca/certs")
  39. endif()
  40. endif()
  41. message(STATUS "certstore path: " ${qca_CERTSTORE})
  42. @@ -390,10 +398,10 @@ endif()
  43. include(CMakePackageConfigHelpers)
  44. configure_package_config_file(
  45. "${CMAKE_CURRENT_SOURCE_DIR}/QcaConfig.cmake.in"
  46. - "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}Config.cmake"
  47. - INSTALL_DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE}
  48. + "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}Config.cmake"
  49. + INSTALL_DESTINATION ${CMAKE_BINARY_DIR}/share/qca/cmake
  50. )
  51. -write_basic_config_version_file("${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" VERSION ${QCA_LIB_VERSION_STRING} COMPATIBILITY AnyNewerVersion)
  52. +write_basic_config_version_file("${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" VERSION ${QCA_LIB_VERSION_STRING} COMPATIBILITY AnyNewerVersion)
  53. if(NOT DEVELOPER_MODE)
  54. @@ -461,10 +469,10 @@ if(NOT DEVELOPER_MODE)
  55. endif()
  56. endif()
  57. - install(EXPORT ${QCA_CONFIG_NAME_BASE}Targets DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE} FILE ${QCA_CONFIG_NAME_BASE}Targets.cmake)
  58. + install(EXPORT ${QCA_CONFIG_NAME_BASE}Targets DESTINATION ${QCA_PREFIX_INSTALL_DIR}/share/qca/cmake FILE ${QCA_CONFIG_NAME_BASE}Targets.cmake)
  59. install(FILES
  60. - "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}Config.cmake"
  61. - "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake"
  62. - DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE}
  63. + "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}Config.cmake"
  64. + "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake"
  65. + DESTINATION ${QCA_PREFIX_INSTALL_DIR}/share/qca/cmake
  66. )
  67. endif()