mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 12:49:00 +08:00
92af1ff59a
* [aws-c-common] Update to 0.6.9 * [aws-checksums] Update to 0.1.11 * [aws-c-event-stream] Upgrade to 0.2.7 * Add aws-c-cal port * Add s2n port * Add port aws-c-io * [aws-c-event-stream] Update port to 0.2.7 * Update aws-sdk-cpp port * Add aws-c-compression port * Add aws-c-auth port * Add aws-c-http port * Add aws-c-mqtt port * Add aws-c-s3 port * Add aws-crt-cpp port * [aws-sdk-cpp] Update port to 1.9.91 version * Fix port issues. * Upgrade aws-sdk-cpp to 1.9.96 Upgrade aws-crt-cpp to 0.15.1 * Support x64-windows * Fix format issues * Specify supported triplets for aws libs * Specify platforms for more aws libs * Support x64-windows-static triplet. * Fix format issue for aws-c-common * Update port versions file * Use new vcpkg cmake methods and format * Use new vcpkg cmake methods and format * update version * Fix s2n port typo * Fix s2n port typo Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
29 lines
946 B
Diff
29 lines
946 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 132f414..c7cfb5f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -503,7 +503,7 @@ else()
|
|
endif()
|
|
|
|
install(EXPORT "${PROJECT_NAME}-targets"
|
|
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
|
|
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/"
|
|
NAMESPACE AWS::
|
|
COMPONENT Development)
|
|
|
|
diff --git a/cmake/s2n-config.cmake b/cmake/s2n-config.cmake
|
|
index 09d1c3a..4e76ed6 100644
|
|
--- a/cmake/s2n-config.cmake
|
|
+++ b/cmake/s2n-config.cmake
|
|
@@ -8,9 +8,5 @@ endif()
|
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
|
|
find_dependency(LibCrypto)
|
|
|
|
-if (BUILD_SHARED_LIBS)
|
|
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
|
|
-else()
|
|
- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
|
|
-endif()
|
|
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
|
|
|