From 1bb3ca1839d37ca41cf12327059df082edf0ca9f Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sun, 19 May 2019 05:22:04 +0800 Subject: [pfultz2-linq] Update to 2019-05-14 (#6517) --- ports/pfultz2-linq/CONTROL | 2 +- ports/pfultz2-linq/fix-cmake.patch | 27 --------------------------- ports/pfultz2-linq/portfile.cmake | 6 ++---- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 ports/pfultz2-linq/fix-cmake.patch diff --git a/ports/pfultz2-linq/CONTROL b/ports/pfultz2-linq/CONTROL index 3cd309de4..e8185c327 100644 --- a/ports/pfultz2-linq/CONTROL +++ b/ports/pfultz2-linq/CONTROL @@ -1,4 +1,4 @@ Source: pfultz2-linq -Version: 2018-02-08 +Version: 2019-05-14 Description: Linq for list comprehension in C++ Build-Depends: boost-fusion, boost-iterator, boost-mpl, boost-optional, boost-preprocessor, boost-range, boost-static-assert, boost-type-traits, boost-unordered, boost-utility diff --git a/ports/pfultz2-linq/fix-cmake.patch b/ports/pfultz2-linq/fix-cmake.patch deleted file mode 100644 index da6838a8b..000000000 --- a/ports/pfultz2-linq/fix-cmake.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 34ae7c7..dd35281 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,5 @@ - cmake_minimum_required(VERSION 3.0) --project(linq) -- --enable_testing() -+project(linq CXX) - - find_package(Boost) - -@@ -37,6 +35,10 @@ install(FILES - install(FILES linq.h DESTINATION include) - install(DIRECTORY linq DESTINATION include) - --add_executable(linq-test test.cpp) --target_link_libraries(linq-test linq ${Boost_test_LIBRARY_RELEASE}) --add_test(NAME linq-test COMMAND linq-test) -+include(CTest) -+ -+if (BUILD_TESTING) -+ add_executable(linq-test test.cpp) -+ target_link_libraries(linq-test linq ${Boost_test_LIBRARY_RELEASE}) -+ add_test(NAME linq-test COMMAND linq-test) -+endif (BUILD_TESTING) diff --git a/ports/pfultz2-linq/portfile.cmake b/ports/pfultz2-linq/portfile.cmake index fe03a89df..de0980b6a 100644 --- a/ports/pfultz2-linq/portfile.cmake +++ b/ports/pfultz2-linq/portfile.cmake @@ -5,11 +5,9 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pfultz2/Linq - REF 51e45d25faa95f945d0bf515f214feed4401e542 - SHA512 128973f79f1cc1f63b5ad4501cc3247352559de382c2ab2fc8fb2df90f8926e373db3469414a2e3816f27fb606c1139a25e94b4e5203201e7ab0320b4b004b4d + REF 7ff0a73fed52be5e11df3d79128ce7b11f430af2 + SHA512 6768e28bf17568436b4c3fed18f6b1edbe048b871ebee25580419b805498beb0800e473ecdc5acc0f9f89bec47d16fd3806018ce6395bdf14a8e2975cde9381f HEAD_REF master - PATCHES - fix-cmake.patch ) vcpkg_configure_cmake( -- cgit v1.2.3