mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-18 23:10:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'boost-1-62' of https://github.com/KindDragon/vcpkg into KindDragon-boost-1-62

Browse Source
This commit is contained in:
Alexander Karatarakis 2016-09-28 16:22:30 -07:00
commit 958b1063ff
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ports/boost/portfile.cmake
View File

@ -1,16 +1,16 @@
include(vcpkg_common_functions) include(vcpkg_common_functions)
vcpkg_download_distfile(ARCHIVE_FILE vcpkg_download_distfile(ARCHIVE_FILE
URLS "http://sourceforge.net/projects/boost/files/boost/1.61.0/boost_1_61_0.tar.bz2" URLS "https://sourceforge.net/projects/boost/files/boost/1.62.0/boost_1_62_0.tar.bz2"
FILENAME "boost_1_61_0.tar.bz2" FILENAME "boost_1_62_0.tar.bz2"
SHA512 a1c7338e2d2dbac8552ede7c554640d22cbb2fda7fbc325dc3cdcb51e769713626695426ffc158cbe0e1729dd9a7b5ad18af4800d74e24539e8d8564268c2b9d SHA512 5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be
) )
vcpkg_extract_source_archive(${ARCHIVE_FILE}) vcpkg_extract_source_archive(${ARCHIVE_FILE})
if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/b2.exe) if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0/b2.exe)
message(STATUS "Bootstrapping") message(STATUS "Bootstrapping")
vcpkg_execute_required_process( vcpkg_execute_required_process(
COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/bootstrap.bat" COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0/bootstrap.bat"
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0 WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0
LOGNAME bootstrap LOGNAME bootstrap
) )
endif() endif()
@ -39,40 +39,40 @@ file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BU
message(STATUS "Building ${TARGET_TRIPLET}-rel") message(STATUS "Building ${TARGET_TRIPLET}-rel")
vcpkg_execute_required_process( vcpkg_execute_required_process(
COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/b2.exe" COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0/b2.exe"
--stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage
--build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
${B2_OPTIONS} ${B2_OPTIONS}
variant=release variant=release
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0 WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0
LOGNAME build-${TARGET_TRIPLET}-rel LOGNAME build-${TARGET_TRIPLET}-rel
) )
message(STATUS "Building ${TARGET_TRIPLET}-rel done") message(STATUS "Building ${TARGET_TRIPLET}-rel done")
message(STATUS "Building ${TARGET_TRIPLET}-dbg") message(STATUS "Building ${TARGET_TRIPLET}-dbg")
vcpkg_execute_required_process( vcpkg_execute_required_process(
COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/b2.exe" COMMAND "${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0/b2.exe"
--stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage
--build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
${B2_OPTIONS} ${B2_OPTIONS}
variant=debug variant=debug
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0 WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0
LOGNAME build-${TARGET_TRIPLET}-dbg LOGNAME build-${TARGET_TRIPLET}-dbg
) )
message(STATUS "Building ${TARGET_TRIPLET}-dbg done") message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
message(STATUS "Packaging headers") message(STATUS "Packaging headers")
file( file(
COPY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/boost COPY ${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0/boost
DESTINATION ${CURRENT_PACKAGES_DIR}/include DESTINATION ${CURRENT_PACKAGES_DIR}/include
PATTERN "config/user.hpp" EXCLUDE PATTERN "config/user.hpp" EXCLUDE
) )
file(COPY ${CURRENT_BUILDTREES_DIR}/src/boost_1_61_0/boost/config/user.hpp file(COPY ${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0/boost/config/user.hpp
DESTINATION ${CURRENT_PACKAGES_DIR}/include/boost/config/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/boost/config/
) )
file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
"\n#define BOOST_ALL_DYN_LINK\n" "\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 ${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright)
message(STATUS "Packaging headers done") message(STATUS "Packaging headers done")
message(STATUS "Packaging ${TARGET_TRIPLET}-rel") message(STATUS "Packaging ${TARGET_TRIPLET}-rel")