diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-09-20 20:07:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-20 20:07:09 -0700 |
| commit | eb4d6f311cf7a46965ad0ee9cd86a0544020de44 (patch) | |
| tree | 8573a2c19efa1fc6ca8e5163a07b466633a4085a | |
| parent | b706a09e509e2385fbf45c473f28b61ddc4b7606 (diff) | |
| parent | 3de9a163fbc507f54458c7fc92e1489d38012b50 (diff) | |
| download | vcpkg-eb4d6f311cf7a46965ad0ee9cd86a0544020de44.tar.gz vcpkg-eb4d6f311cf7a46965ad0ee9cd86a0544020de44.zip | |
Merge pull request #44 from KindDragon/boost-new-version
Update boost to version 1.61
| -rw-r--r-- | ports/boost/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index 8307022f0..afd6748af 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,3 +1,3 @@ Source: boost -Version: 1.60 +Version: 1.61 Description: Peer-reviewed portable C++ source libraries diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index acdfb9379..b133b4275 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -1,16 +1,16 @@ include(vcpkg_common_functions) vcpkg_download_distfile(ARCHIVE_FILE - URL "http://sourceforge.net/projects/boost/files/boost/1.60.0/boost_1_60_0.tar.bz2" - FILENAME "boost_1_60_0.tar.bz2" - MD5 65a840e1a0b13a558ff19eeb2c4f0cbe + URL "http://sourceforge.net/projects/boost/files/boost/1.61.0/boost_1_61_0.tar.bz2" + FILENAME "boost_1_61_0.tar.bz2" + MD5 6095876341956f65f9d35939ccea1a9f ) vcpkg_extract_source_archive(${ARCHIVE_FILE}) -if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src/boost_1_60_0/b2.exe) +if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/b2.exe) message(STATUS "Bootstrapping") vcpkg_execute_required_process( - COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_60_0/bootstrap.bat" - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_60_0 + COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/bootstrap.bat" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0 LOGNAME bootstrap ) endif() @@ -36,40 +36,40 @@ endif() message(STATUS "Building ${TARGET_TRIPLET}-rel") vcpkg_execute_required_process( - COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_60_0/b2.exe" + COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/b2.exe" --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${B2_OPTIONS} variant=release - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_60_0 + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0 LOGNAME build-${TARGET_TRIPLET}-rel ) message(STATUS "Building ${TARGET_TRIPLET}-rel done") message(STATUS "Building ${TARGET_TRIPLET}-dbg") vcpkg_execute_required_process( - COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_60_0/b2.exe" + COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/b2.exe" --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg ${B2_OPTIONS} variant=debug - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_60_0 + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0 LOGNAME build-${TARGET_TRIPLET}-dbg ) message(STATUS "Building ${TARGET_TRIPLET}-dbg done") message(STATUS "Packaging headers") file( - COPY ${CURRENT_BUILDTREES_DIR}/src/boost_1_60_0/boost + COPY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/boost DESTINATION ${CURRENT_PACKAGES_DIR}/include PATTERN "config/user.hpp" EXCLUDE ) -file(COPY ${CURRENT_BUILDTREES_DIR}/src/boost_1_60_0/boost/config/user.hpp +file(COPY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/boost/config/user.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/boost/config/ ) file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#define BOOST_ALL_DYN_LINK\n" ) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/boost_1_60_0/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright) +file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright) message(STATUS "Packaging headers done") message(STATUS "Packaging ${TARGET_TRIPLET}-rel") |