mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 17:57:49 +08:00
29 lines
954 B
Diff
29 lines
954 B
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 433b6c5..41874a0 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -209,7 +209,7 @@ else()
|
||
|
|
endif()
|
||
|
|
|
||
|
|
install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
|
||
|
|
- DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}"
|
||
|
|
+ DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake"
|
||
|
|
NAMESPACE AWS::
|
||
|
|
COMPONENT Development)
|
||
|
|
|
||
|
|
diff --git a/cmake/aws-c-common-config.cmake b/cmake/aws-c-common-config.cmake
|
||
|
|
index c322b52..6e5daa0 100644
|
||
|
|
--- a/cmake/aws-c-common-config.cmake
|
||
|
|
+++ b/cmake/aws-c-common-config.cmake
|
||
|
|
@@ -1,9 +1,5 @@
|
||
|
|
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||
|
|
find_package(Threads REQUIRED)
|
||
|
|
|
||
|
|
-if (BUILD_SHARED_LIBS)
|
||
|
|
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake)
|
||
|
|
-else()
|
||
|
|
- include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake)
|
||
|
|
-endif()
|
||
|
|
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
|
||
|
|
|