diff options
| author | Wimok Nupphiboon <wimok.mok@gmail.com> | 2018-04-22 20:35:52 +0700 |
|---|---|---|
| committer | Wimok Nupphiboon <wimok.mok@gmail.com> | 2018-04-22 20:35:52 +0700 |
| commit | befd3c6be2db90e5bc3a7acb2b0103cb6dfd7b42 (patch) | |
| tree | fd4cfee016003e6be2898ac5d37f679a567cad76 /ports/boost-test | |
| parent | 4c028691c7f03335f6fb8a38ce80794c213819cb (diff) | |
| parent | 4f52f53b99f6a5465157958bc99f79cc0b2712ad (diff) | |
| download | vcpkg-befd3c6be2db90e5bc3a7acb2b0103cb6dfd7b42.tar.gz vcpkg-befd3c6be2db90e5bc3a7acb2b0103cb6dfd7b42.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'ports/boost-test')
| -rw-r--r-- | ports/boost-test/CONTROL | 4 | ||||
| -rw-r--r-- | ports/boost-test/portfile.cmake | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ports/boost-test/CONTROL b/ports/boost-test/CONTROL index 95b0d8fe9..182c9ccf6 100644 --- a/ports/boost-test/CONTROL +++ b/ports/boost-test/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-test
-Version: 1.66.0-2
-Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-modular-build-helper, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-io, boost-iterator, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-range, boost-smart-ptr, boost-static-assert, boost-timer, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.67.0-2
+Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-timer, boost-type-traits, boost-utility, boost-vcpkg-helpers
Description: Boost test module
diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index acb28c7d4..d5834c60d 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -5,16 +5,20 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/test
- REF boost-1.66.0
- SHA512 f5f0557fc7afb1c085765edda5ec37ce2a0f31aa39c861a7979dfd5344751978139cc3eef44d773140e4b023c0123065169fc11ae889ca1ea51f58bdf5018a5d
+ REF boost-1.67.0
+ SHA512 9af937ef02982039b5aab54e142b877fef6c46f71b7cc8c83d81f850f4b4229ee93425ab8a88e6888952686e1e23da6591da072432a06c1bceae83c793a43cf5
HEAD_REF master
)
+file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents)
+string(REPLACE "import ../../predef/check/predef" "import predef/check/predef" _contents "${_contents}")
+file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${SOURCE_PATH}/build/predef")
+
include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
-
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
file(GLOB MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/lib/*_exec_monitor*)
@@ -28,3 +32,4 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(COPY ${DEBUG_MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
file(REMOVE ${DEBUG_MONITOR_LIBS})
endif()
+
|