mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
3856a6bda7
* [many ports] Update version * [aws-checksums] Add dependency aws-c-common * update version * port updates * port updates * Update ports/brotli/CONTROL * [draco] fix uwp build * [blosc] Fix win static build * [blosc] fix unix build * move changes to other PRs * Remove unuse patches
29 lines
927 B
Diff
29 lines
927 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 9b01f56..3cc541d 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -239,7 +239,7 @@ else()
|
|
endif()
|
|
|
|
install(EXPORT "${PROJECT_NAME}-targets"
|
|
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
|
|
+ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake"
|
|
NAMESPACE AWS::
|
|
COMPONENT Development)
|
|
|
|
diff --git a/cmake/aws-c-common-config.cmake b/cmake/aws-c-common-config.cmake
|
|
index e495210..b7676c2 100644
|
|
--- a/cmake/aws-c-common-config.cmake
|
|
+++ b/cmake/aws-c-common-config.cmake
|
|
@@ -4,9 +4,5 @@ if(WIN32 OR UNIX OR APPLE)
|
|
find_package(Threads REQUIRED)
|
|
endif()
|
|
|
|
-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)
|
|
|