From bff67a592def0047547237ec2b0e6420e055dba6 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 25 Nov 2016 21:44:01 -0800 Subject: Revert "Merge pull request #348 from kirkshoop/rxcpp3.0.0" This reverts commit 82c29e0dc5f7a19f6294b2b654acf2c7b5bae60d, reversing changes made to a5b1ed784aafd000a9e14dfc2c6ed228d5fe2952. --- ports/rxcpp/portfile.cmake | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'ports/rxcpp') diff --git a/ports/rxcpp/portfile.cmake b/ports/rxcpp/portfile.cmake index f767d8a3b..440c7ccf3 100644 --- a/ports/rxcpp/portfile.cmake +++ b/ports/rxcpp/portfile.cmake @@ -3,16 +3,21 @@ include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/RxCpp-3.0.0) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/Reactive-Extensions/RxCpp/archive/v3.0.0.tar.gz" - FILENAME "RxCpp-v3.0.0.tar.gz" + FILENAME "v3.0.0.tar.gz" SHA512 6d810b6163d0920d531f32a13729e290c81b47d5fc9c3e3d3d8a25d27a6f0671fec097d091bef7383b7e556e9e5471db087bb955e7f4fd9a5fdc9e7b06050844 ) vcpkg_extract_source_archive(${ARCHIVE}) file(INSTALL - ${SOURCE_PATH}/Rx/v2/src + ${SOURCE_PATH}/Rx/v2/src/rxcpp DESTINATION ${CURRENT_PACKAGES_DIR}/include ) file(INSTALL - ${SOURCE_PATH}/license.md - DESTINATION ${CURRENT_PACKAGES_DIR}/share/rxcpp RENAME copyright) \ No newline at end of file + ${SOURCE_PATH}/Ix/CPP/src/cpplinq + DESTINATION ${CURRENT_PACKAGES_DIR}/include +) + +file(INSTALL + ${SOURCE_PATH}/license.md + DESTINATION ${CURRENT_PACKAGES_DIR}/share/rxcpp RENAME copyright) \ No newline at end of file -- cgit v1.2.3