diff options
| author | LiGuilin <liguilin0522@qq.com> | 2016-10-08 08:34:12 +0800 |
|---|---|---|
| committer | LiGuilin <liguilin0522@qq.com> | 2016-10-08 08:34:12 +0800 |
| commit | c91da2b0c4c3d9218c0b4d1712d744bb35245a61 (patch) | |
| tree | e1ae0664a4f21f3948bde8c8f9f9e55dea0cb11f /ports/boost | |
| parent | 280d88b34033ab728e02f725d8d8ff5f9250c6de (diff) | |
| parent | a0f621c0fca2c3de8bd5249f023979b800c543cf (diff) | |
| download | vcpkg-c91da2b0c4c3d9218c0b4d1712d744bb35245a61.tar.gz vcpkg-c91da2b0c4c3d9218c0b4d1712d744bb35245a61.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'ports/boost')
| -rw-r--r-- | ports/boost/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 31 |
2 files changed, 19 insertions, 14 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index afd6748af..fc0f3cef7 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,3 +1,3 @@ Source: boost -Version: 1.61 +Version: 1.62 Description: Peer-reviewed portable C++ source libraries diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index b133b4275..276bbcbcc 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -1,16 +1,18 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0) + vcpkg_download_distfile(ARCHIVE_FILE - 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 + URLS "https://sourceforge.net/projects/boost/files/boost/1.62.0/boost_1_62_0.tar.bz2" + FILENAME "boost_1_62_0.tar.bz2" + SHA512 5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be ) vcpkg_extract_source_archive(${ARCHIVE_FILE}) -if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/b2.exe) +if(NOT EXISTS ${SOURCE_PATH}/b2.exe) message(STATUS "Bootstrapping") vcpkg_execute_required_process( - COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/bootstrap.bat" - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0 + COMMAND "${SOURCE_PATH}/bootstrap.bat" + WORKING_DIRECTORY ${SOURCE_PATH} LOGNAME bootstrap ) endif() @@ -34,42 +36,45 @@ if(TRIPLET_SYSTEM_NAME MATCHES "WindowsStore") set(ENV{BOOST_BUILD_PATH} ${CMAKE_CURRENT_LIST_DIR}) endif() + +file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + message(STATUS "Building ${TARGET_TRIPLET}-rel") vcpkg_execute_required_process( - COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/b2.exe" + COMMAND "${SOURCE_PATH}/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_61_0 + WORKING_DIRECTORY ${SOURCE_PATH} 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_61_0/b2.exe" + COMMAND "${SOURCE_PATH}/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_61_0 + WORKING_DIRECTORY ${SOURCE_PATH} LOGNAME build-${TARGET_TRIPLET}-dbg ) message(STATUS "Building ${TARGET_TRIPLET}-dbg done") message(STATUS "Packaging headers") file( - COPY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/boost + COPY ${SOURCE_PATH}/boost DESTINATION ${CURRENT_PACKAGES_DIR}/include PATTERN "config/user.hpp" EXCLUDE ) -file(COPY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/boost/config/user.hpp +file(COPY ${SOURCE_PATH}/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_61_0/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright) message(STATUS "Packaging headers done") message(STATUS "Packaging ${TARGET_TRIPLET}-rel") |