[pfultz2-linq] Update to 2019-05-14 (#6517)

This commit is contained in:
myd7349 2019-05-19 05:22:04 +08:00 committed by Robert Schumacher
parent 79fd23fe99
commit 1bb3ca1839
3 changed files with 3 additions and 32 deletions

View File

@ -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

View File

@ -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)

View File

@ -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(