]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
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 | ||
16 | # To prefer plugins from build tree when run qca from build tree | |
17 | - file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf | |
18 | -"[Paths] | |
19 | -Plugins=${CMAKE_BINARY_DIR}/lib/${QCA_LIB_NAME} | |
20 | -") | |
21 | + if(NOT BUILD_SHARED_LIBS OR QT_IS_STATIC) | |
22 | + file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf | |
23 | + "[Paths] | |
24 | + Plugins=${CMAKE_BINARY_DIR}/lib/${QCA_LIB_NAME} | |
25 | + ") | |
26 | + else() | |
27 | + file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf | |
28 | + "[Paths] | |
29 | + Plugins=${CMAKE_BINARY_DIR}/bin/${QCA_LIB_NAME} | |
30 | + ") | |
31 | + endif() | |
32 | endif() | |
33 | ||
34 | if (APPLE) | |
35 | @@ -309,7 +317,7 @@ else() | |
36 | set( qca_CERTSTORE "${CMAKE_CURRENT_SOURCE_DIR}/certs/rootcerts.pem") | |
37 | # note that INSTALL_FILES targets are relative to the current installation prefix... | |
38 | if(NOT DEVELOPER_MODE) | |
39 | - install(FILES "${qca_CERTSTORE}" DESTINATION "${QCA_PREFIX_INSTALL_DIR}/certs") | |
40 | + install(FILES "${qca_CERTSTORE}" DESTINATION "${QCA_PREFIX_INSTALL_DIR}/share/qca/certs") | |
41 | endif() | |
42 | endif() | |
43 | message(STATUS "certstore path: " ${qca_CERTSTORE}) | |
44 | @@ -390,10 +398,10 @@ endif() | |
45 | include(CMakePackageConfigHelpers) | |
46 | configure_package_config_file( | |
47 | "${CMAKE_CURRENT_SOURCE_DIR}/QcaConfig.cmake.in" | |
48 | - "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}Config.cmake" | |
49 | - INSTALL_DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE} | |
50 | + "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}Config.cmake" | |
51 | + INSTALL_DESTINATION ${CMAKE_BINARY_DIR}/share/qca/cmake | |
52 | ) | |
53 | -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) | |
54 | +write_basic_config_version_file("${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" VERSION ${QCA_LIB_VERSION_STRING} COMPATIBILITY AnyNewerVersion) | |
55 | ||
56 | if(NOT DEVELOPER_MODE) | |
57 | ||
58 | @@ -461,10 +469,10 @@ if(NOT DEVELOPER_MODE) | |
59 | endif() | |
60 | endif() | |
61 | ||
62 | - install(EXPORT ${QCA_CONFIG_NAME_BASE}Targets DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE} FILE ${QCA_CONFIG_NAME_BASE}Targets.cmake) | |
63 | + install(EXPORT ${QCA_CONFIG_NAME_BASE}Targets DESTINATION ${QCA_PREFIX_INSTALL_DIR}/share/qca/cmake FILE ${QCA_CONFIG_NAME_BASE}Targets.cmake) | |
64 | install(FILES | |
65 | - "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}Config.cmake" | |
66 | - "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" | |
67 | - DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE} | |
68 | + "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}Config.cmake" | |
69 | + "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" | |
70 | + DESTINATION ${QCA_PREFIX_INSTALL_DIR}/share/qca/cmake | |
71 | ) | |
72 | endif() |