mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 07:59:02 +08:00
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)
|
||
|
|
|