Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update boost to version 1.61 #9

Closed
wants to merge 1 commit into from
Closed

Update boost to version 1.61 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/boost/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: boost
Version: 1.60
Version: 1.61
Description: Peer-reviewed portable C++ source libraries
26 changes: 13 additions & 13 deletions ports/boost/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -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")
Expand Down