mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-17 03:07:50 +08:00
64 lines
3.0 KiB
Diff
64 lines
3.0 KiB
Diff
From a3a8d50f3bdcb4df630f7126718c21f23efd7832 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kaspar <alexander.kaspar@gmail.com>
|
|
Date: Wed, 30 Nov 2016 15:45:12 +0100
|
|
Subject: [PATCH] fix path for vcpkg
|
|
|
|
---
|
|
CMakeLists.txt | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 605621b..3b5a9be 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -277,7 +277,7 @@ if(DEVELOPER_MODE)
|
|
# To prefer plugins from build tree when run qca from build tree
|
|
file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf
|
|
"[Paths]
|
|
-Plugins=${CMAKE_BINARY_DIR}/lib/${QCA_LIB_NAME}
|
|
+Plugins=${CMAKE_BINARY_DIR}/bin/${QCA_LIB_NAME}
|
|
")
|
|
endif()
|
|
|
|
@@ -320,7 +320,7 @@ else (qca_CERTSTORE)
|
|
set( qca_CERTSTORE "${CMAKE_CURRENT_SOURCE_DIR}/certs/rootcerts.pem")
|
|
# note that INSTALL_FILES targets are relative to the current installation prefix...
|
|
if(NOT DEVELOPER_MODE)
|
|
- install(FILES "${qca_CERTSTORE}" DESTINATION "${QCA_PREFIX_INSTALL_DIR}/certs")
|
|
+ install(FILES "${qca_CERTSTORE}" DESTINATION "${QCA_PREFIX_INSTALL_DIR}/share/qca/certs")
|
|
endif()
|
|
endif (qca_CERTSTORE)
|
|
message(STATUS "certstore path: " ${qca_CERTSTORE})
|
|
@@ -401,10 +401,10 @@ endif(DOXYGEN_FOUND)
|
|
include(CMakePackageConfigHelpers)
|
|
configure_package_config_file(
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/QcaConfig.cmake.in"
|
|
- "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}Config.cmake"
|
|
- INSTALL_DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE}
|
|
+ "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}Config.cmake"
|
|
+ INSTALL_DESTINATION ${CMAKE_BINARY_DIR}/share/qca/cmake
|
|
)
|
|
-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)
|
|
+write_basic_config_version_file("${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" VERSION ${QCA_LIB_VERSION_STRING} COMPATIBILITY AnyNewerVersion)
|
|
|
|
if(NOT DEVELOPER_MODE)
|
|
|
|
@@ -472,10 +472,10 @@ if(NOT DEVELOPER_MODE)
|
|
endif()
|
|
endif()
|
|
|
|
- install(EXPORT ${QCA_CONFIG_NAME_BASE}Targets DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE} FILE ${QCA_CONFIG_NAME_BASE}Targets.cmake)
|
|
+ install(EXPORT ${QCA_CONFIG_NAME_BASE}Targets DESTINATION ${QCA_PREFIX_INSTALL_DIR}/share/qca/cmake FILE ${QCA_CONFIG_NAME_BASE}Targets.cmake)
|
|
install(FILES
|
|
- "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}Config.cmake"
|
|
- "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake"
|
|
- DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE}
|
|
+ "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}Config.cmake"
|
|
+ "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake"
|
|
+ DESTINATION ${QCA_PREFIX_INSTALL_DIR}/share/qca/cmake
|
|
)
|
|
endif()
|
|
--
|
|
2.8.1.windows.1
|
|
|