diff --git a/vcpkg.json b/vcpkg.json index 5c27a0a..6628349 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -4,7 +4,7 @@ "version-string": "1.4.0", "description": "A basic transport layer for games.", "homepage": "https://github.com/ValveSoftware/GameNetworkingSockets", - "builtin-baseline": "c3867e714dd3a51c272826eea77267876517ed99", + "builtin-baseline": "522253caf47268c1724f486a035e927a42a90092", "dependencies": [ "protobuf", "openssl" ], "default-features": [ "openssl" ], "features": { diff --git a/vcpkg_ports/gamenetworkingsockets/portfile.cmake b/vcpkg_ports/gamenetworkingsockets/portfile.cmake index a12448e..5603bce 100644 --- a/vcpkg_ports/gamenetworkingsockets/portfile.cmake +++ b/vcpkg_ports/gamenetworkingsockets/portfile.cmake @@ -43,25 +43,22 @@ if (BUILD_TESTS OR BUILD_TOOLS) set(BUILD_STATIC_LIB true) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DUSE_CRYPTO=${CRYPTO_BACKEND} - -DBUILD_STATIC_LIB=${BUILD_STATIC_LIB} - -DBUILD_SHARED_LIB=${BUILD_SHARED_LIB} - -DMSVC_CRT_STATIC=${MSVC_CRT_STATIC} - ${FEATURE_OPTIONS} + -DUSE_CRYPTO=${CRYPTO_BACKEND} + -DBUILD_STATIC_LIB=${BUILD_STATIC_LIB} + -DBUILD_SHARED_LIB=${BUILD_SHARED_LIB} + -DMSVC_CRT_STATIC=${MSVC_CRT_STATIC} + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/GameNetworkingSockets") +vcpkg_fixup_pkgconfig() -# Copy some files - -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_copy_pdbs() - -# Cleanup some file droppings that our cmakefile really should -# not be publishing file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")