From 447117d18c0895a7d4131e2c975a20492ac982fc Mon Sep 17 00:00:00 2001 From: kiwixz Date: Sat, 16 Feb 2019 14:25:51 +0000 Subject: [PATCH 1/2] [doctest] update to 2.2.3, export cmake config --- ports/doctest/CONTROL | 2 +- ports/doctest/portfile.cmake | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL index 6e2c6242c163f4..c4afd763a5944b 100644 --- a/ports/doctest/CONTROL +++ b/ports/doctest/CONTROL @@ -1,3 +1,3 @@ Source: doctest -Version: 2.2.2 +Version: 2.2.3 Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake index 2a698a12de773c..a2bb4c958fcc42 100644 --- a/ports/doctest/portfile.cmake +++ b/ports/doctest/portfile.cmake @@ -1,15 +1,21 @@ -#header-only library include(vcpkg_common_functions) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onqtam/doctest - REF 2.2.2 - SHA512 a312365f156de9d137ae3992bbfdd2875d677259c53a319938e3d31af6ad72fae82f75482bda708fe2b93a5a3fd1369e9bca9d84b1309d865387ad27146e4ac3 + REF 2.2.3 + SHA512 764463178ea109d46714751a0e5a74d9896c3cf3f8b8c3424a9252c58d9f2c1a2c7fa7eec68e516fb96f4634ae0078ea00d49d28d45a6331c3ebcbe1ed6b1175 HEAD_REF master ) -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/doctest RENAME copyright) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/doctest) -# Copy header file -file(INSTALL ${SOURCE_PATH}/doctest/doctest.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/doctest) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/doctest/copyright COPYONLY) From 042084b429538ad73d923ff1f31ad316dec385dc Mon Sep 17 00:00:00 2001 From: kiwixz Date: Sat, 16 Feb 2019 19:26:48 +0000 Subject: [PATCH 2/2] [doctest] do not build tests --- ports/doctest/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake index a2bb4c958fcc42..53defc4306d66d 100644 --- a/ports/doctest/portfile.cmake +++ b/ports/doctest/portfile.cmake @@ -11,6 +11,8 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DDOCTEST_WITH_TESTS=OFF ) vcpkg_install_cmake()