diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-05-16 18:33:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 18:33:32 -0700 |
| commit | 9d473a69545ac648b9ea2067c007b57dfad7462b (patch) | |
| tree | b22899ab0422bed99fd9c39e9d119a65aafe7325 /ports/ompl | |
| parent | 208bb8eefcc13ab7aa6122b91f38ffec0b378e13 (diff) | |
| download | vcpkg-9d473a69545ac648b9ea2067c007b57dfad7462b.tar.gz vcpkg-9d473a69545ac648b9ea2067c007b57dfad7462b.zip | |
[boost] Update to 1.70.0 (#6141)
* [boost] Update to 1.70.0
* [boost-build] Update to 1.70.0
* [folly][freeopcua][libtorrent][websocketpp] Upgrades/patches to handle boost 1.70
* [boost-variant] Revert to 1.69 due to regression
[fizz][folly] Update and fix for boost 1.70
[libsodium] Use CMake buildsystem replacement to enable non-Windows
* [wangle] Update. [folly] Avoid linking debug libs in release.
* [pcl] Fix compatibility with boost 1.70
* [fizz] Handle merge regression
* [arrow] Modernize and fix cmake targets
* [boost-type-traits] Update patches for arm64-windows
* [boost-locale] Add boost-system and boost-thread as arm64 dependencies
* [ompl] Add missing boost-timer dependency
Diffstat (limited to 'ports/ompl')
| -rw-r--r-- | ports/ompl/CONTROL | 4 | ||||
| -rw-r--r-- | ports/ompl/portfile.cmake | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/ports/ompl/CONTROL b/ports/ompl/CONTROL index 2cadddeee..bf9ad3a1f 100644 --- a/ports/ompl/CONTROL +++ b/ports/ompl/CONTROL @@ -1,7 +1,7 @@ Source: ompl
-Version: 1.4.2-0
+Version: 1.4.2-1
Description: The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms
-Build-Depends: boost-disjoint-sets, boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, eigen3
+Build-Depends: boost-disjoint-sets, boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, boost-timer, eigen3
Feature: app
Description: Add support for reading meshes and performing collision checking
diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake index d1559b933..c8fdc9927 100644 --- a/ports/ompl/portfile.cmake +++ b/ports/ompl/portfile.cmake @@ -1,15 +1,3 @@ -# Common Ambient Variables:
-# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
-# PORT = current port name (zlib, etc)
-# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
-# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
-# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
-# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
-#
-
include(vcpkg_common_functions)
string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
|