From 174546a1c8b0eb58bc9d1fa2909172ebca5704bc Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Thu, 10 Nov 2022 02:30:22 +0800 Subject: [PATCH] [trompeloeil] Update to v43 (#27709) * update trompeloeil * update license * update version * remove patch * update version * update copyright * update version * remove share/doc * update version Co-authored-by: Monica --- ports/trompeloeil/disable_master_project.patch | 14 -------------- ports/trompeloeil/portfile.cmake | 9 +++++---- ports/trompeloeil/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/t-/trompeloeil.json | 5 +++++ 5 files changed, 13 insertions(+), 20 deletions(-) delete mode 100644 ports/trompeloeil/disable_master_project.patch diff --git a/ports/trompeloeil/disable_master_project.patch b/ports/trompeloeil/disable_master_project.patch deleted file mode 100644 index 155363d7df..0000000000 --- a/ports/trompeloeil/disable_master_project.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6e59ab8..615a6cb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,9 +34,6 @@ target_include_directories( - ) - - set(MASTER_PROJECT OFF) --if (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR}) -- set(MASTER_PROJECT ON) --endif() - - if (MASTER_PROJECT AND CMAKE_BUILD_TYPE MATCHES Debug) - diff --git a/ports/trompeloeil/portfile.cmake b/ports/trompeloeil/portfile.cmake index 1390637eb1..4d6be62ae6 100644 --- a/ports/trompeloeil/portfile.cmake +++ b/ports/trompeloeil/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rollbear/trompeloeil - REF v41 - SHA512 f68a3f1c5f2cd1b49fb8c90612383d68ca1a0bcd1ca6b0a0fbe6e3cef23af011b5503d788023519f182a1221d55774796115f9248caf33175f919fd18e5e43f9 + REF ba406bfd71caf63f2180990a390ff5518e570c21 # v43 + SHA512 5a638392ee4078690e94a61fd5838f6b0ffd67784a6cb139c114286c5cb8453c450252c550e9efee575aa38d02d5de1b51ba4df6a1679d02987606559a96520d HEAD_REF master - PATCHES disable_master_project.patch ) vcpkg_cmake_configure( @@ -21,4 +20,6 @@ if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/trompeloeil.hpp") message(FATAL_ERROR "Main includes have moved. Please update the forwarder.") endif() -configure_file("${SOURCE_PATH}/LICENSE_1_0.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") diff --git a/ports/trompeloeil/vcpkg.json b/ports/trompeloeil/vcpkg.json index 6c70e20d34..efaae3b100 100644 --- a/ports/trompeloeil/vcpkg.json +++ b/ports/trompeloeil/vcpkg.json @@ -1,8 +1,9 @@ { "name": "trompeloeil", - "version": "41", + "version": "43", "description": "A thread-safe header-only mocking framework for C++11/14 using the Boost Software License 1.0", "homepage": "https://github.com/rollbear/trompeloeil", + "license": "BSL-1.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index bcada506b3..4e8564202d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7545,7 +7545,7 @@ "port-version": 5 }, "trompeloeil": { - "baseline": "41", + "baseline": "43", "port-version": 0 }, "tsl-hopscotch-map": { diff --git a/versions/t-/trompeloeil.json b/versions/t-/trompeloeil.json index 3765977685..1a3a6ac725 100644 --- a/versions/t-/trompeloeil.json +++ b/versions/t-/trompeloeil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "876864d2915f8530d28bd8a2c6ca0fd418dd7829", + "version": "43", + "port-version": 0 + }, { "git-tree": "7345802a43866751e65d0ce0caaa24566a1b7a3a", "version": "41",