Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/jack/upgrade_libi

3 files changed, 50 insertions, 6 deletions

diff --git a/ports/check/CONTROL b/ports/check/CONTROL
index f529ad731..d6ea30554 100644
--- a/ports/check/CONTROL
+++ b/ports/check/CONTROL
@@ -1,3 +1,4 @@
 Source: check

-Version: 0.13.0

+Version: 0.13.0-2

+Homepage: https://github.com/libcheck/check

 Description: A unit testing framework for C

diff --git a/ports/check/fix-lib-path.patch b/ports/check/fix-lib-path.patch
new file mode 100644
index 000000000..7ed76195d
--- /dev/null
+++ b/ports/check/fix-lib-path.patch
@@ -0,0 +1,43 @@
+diff --git a/doc/example/src/CMakeLists.txt b/doc/example/src/CMakeLists.txt
+index b5e211e..2a92a1a 100644
+--- a/doc/example/src/CMakeLists.txt
++++ b/doc/example/src/CMakeLists.txt
+@@ -18,7 +18,7 @@ target_link_libraries(main money)
+ 
+ install(TARGETS money
+   RUNTIME DESTINATION bin
+-  LIBRARY DESTINATION lib
+-  ARCHIVE DESTINATION lib)
++  LIBRARY DESTINATION lib/manual-link
++  ARCHIVE DESTINATION lib/manual-link)
+ 
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/money.h DESTINATION include)
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index e6346dd..8f5762a 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -70,3 +70,8 @@ set(HEADERS libcompat.h)
+ 
+ add_library(compat STATIC ${SOURCES} ${HEADERS})
+ 
++install(TARGETS compat
++    RUNTIME DESTINATION bin
++    LIBRARY DESTINATION lib/manual-link
++    ARCHIVE DESTINATION lib/manual-link
++)
+\ No newline at end of file
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 37fcaf8..334fc9c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -180,8 +180,8 @@ target_include_directories(checkShared
+ 
+ install(TARGETS check checkShared
+   EXPORT check-targets
+-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ )
diff --git a/ports/check/portfile.cmake b/ports/check/portfile.cmake
index c5271e8f7..7b44127a6 100644
--- a/ports/check/portfile.cmake
+++ b/ports/check/portfile.cmake
@@ -1,10 +1,10 @@
-include(vcpkg_common_functions)

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO libcheck/check

     REF 0.13.0

     SHA512 7943021c5bc3b5ca7bc552f6fe1287e384724d69e5bb128d58256692e810b194e506fc1b65ea4fed27d065e2176e7371483e918beb48125abfe3b6f1ca68eb8f

     HEAD_REF master

+    PATCHES fix-lib-path.patch

 )

 

 vcpkg_configure_cmake(

@@ -14,7 +14,9 @@ vcpkg_configure_cmake(
 

 vcpkg_install_cmake()

 

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)

+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/check)

+

+vcpkg_copy_pdbs()

 

 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)

@@ -24,6 +26,4 @@ endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)

 

 # Handle copyright

-file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/check RENAME copyright)

-

-vcpkg_copy_pdbs()
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file