aboutsummaryrefslogtreecommitdiff
path: root/ports/dartsim
diff options
context:
space:
mode:
authorBilly O'Neal <bion@microsoft.com>2021-04-26 10:27:45 -0700
committerGitHub <noreply@github.com>2021-04-26 10:27:45 -0700
commita9b27ed5dffbf70b135eddb0c4729f3ca87f106c (patch)
treecc562b219c82e40567925a48248cbc17b2cc2b59 /ports/dartsim
parent84e5852cfaa8e7875027e79a29a5534bb5d4a475 (diff)
downloadvcpkg-a9b27ed5dffbf70b135eddb0c4729f3ca87f106c.tar.gz
vcpkg-a9b27ed5dffbf70b135eddb0c4729f3ca87f106c.zip
Update VMs, CMake to 3.20.1, CUDA to 11.3, and pwsh to 7.1.3 (#17331)
* Update to CUDA 11.3 on Windows. * Update PowerShell to 7.1.3. * Update CUDA to 11.3 on Linux. * "Explode" VM provisioning scripts for more consistent feedback during deploy. This resolves the deployment script often hanging with no feedback as to why. * [libdatachannel] Fix use of deprecated result_type typedef. Submitted upstream as https://github.com/paullouisageneau/libdatachannel/pull/413 * [libvpx] Get the libvpx outputs from the correct place. (Perhaps VS2019 version 16.10 moved where these are placed? I've been defensive and left an attempt to find from the old location in place.) * [chromaprint] Support implementations where lrintf is an intrinsic. * Add provision-entire-image script. * [cudnn] Disable download-on-the-fly due to licensing concerns. * Add libnccl to Linux VMs. * [wangle] Disable x64-windows due to an ICE. * [cmake] Update cmake to 3.20.1 to avoid https://gitlab.kitware.com/cmake/cmake/-/issues/21571 race * [libudis86] Fix passing a bogus working directory which fails on CMake 3.20.x * [dartsim] Disable unit tests, examples, and tutorials, some of which have CMake authoring errors rejected by 3.20.1. * Add thrust to the cuda installees. * [tensorflow] Put .bzl in CURRENT_BUILDTREES_DIR to avoid running out of disk space in CI and to respect --clean-after-build. * [dimcli] Skip port broken by changes in VS2019 project system. * [upb] Disable an additional warning. * [libhv] Fix typo DISABLE_PARALLEL => DISABLE_PARALLEL_CONFIGURE * Update pools
Diffstat (limited to 'ports/dartsim')
-rw-r--r--ports/dartsim/disable_unit_tests_examples_and_tutorials.patch20
-rw-r--r--ports/dartsim/portfile.cmake26
-rw-r--r--ports/dartsim/vcpkg.json3
3 files changed, 36 insertions, 13 deletions
diff --git a/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch b/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch
new file mode 100644
index 000000000..08119ce39
--- /dev/null
+++ b/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e32147d..5c85186 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -279,6 +279,7 @@ add_subdirectory(dart)
+
+ set(DART_IN_SOURCE_BUILD TRUE)
+
++if (0)
+ if(TARGET dart AND NOT DART_BUILD_DARTPY)
+
+ # Add a "tests" target to build unit tests.
+@@ -330,6 +331,7 @@ if(TARGET dart AND NOT DART_BUILD_DARTPY)
+ endif(DART_VERBOSE)
+
+ endif()
++endif()
+
+ if (DART_BUILD_DARTPY)
+ add_subdirectory(python)
diff --git a/ports/dartsim/portfile.cmake b/ports/dartsim/portfile.cmake
index 0af5f8e9a..c208482f1 100644
--- a/ports/dartsim/portfile.cmake
+++ b/ports/dartsim/portfile.cmake
@@ -7,20 +7,23 @@ vcpkg_from_github(
REF v6.9.4
SHA512 a9e8712a294286772ee1e3c3899aac7d202f1d3c2b9242ebeaddb2a142787b192d5421a6e3f889dd9ff9ca9e9106b1f893a0c8ab2e1656b04fac6d0be13494ba
HEAD_REF release-6.9
- PATCHES 1478.patch
- 1497.patch
+ PATCHES
+ 1478.patch
+ 1497.patch
+ disable_unit_tests_examples_and_tutorials.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- OPTIONS -DDART_VERBOSE=ON
- -DDART_MSVC_DEFAULT_OPTIONS=ON
- -DDART_SKIP_DOXYGEN=ON
- -DDART_SKIP_FLANN=ON
- -DDART_SKIP_IPOPT=ON
- -DDART_SKIP_NLOPT=ON
- -DDART_SKIP_OPENGL=ON
- -DDART_SKIP_pagmo=ON
+ OPTIONS
+ -DDART_VERBOSE=ON
+ -DDART_MSVC_DEFAULT_OPTIONS=ON
+ -DDART_SKIP_DOXYGEN=ON
+ -DDART_SKIP_FLANN=ON
+ -DDART_SKIP_IPOPT=ON
+ -DDART_SKIP_NLOPT=ON
+ -DDART_SKIP_OPENGL=ON
+ -DDART_SKIP_pagmo=ON
)
vcpkg_install_cmake()
@@ -36,5 +39,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/dartsim RENAME copyright)
-
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/dartsim/vcpkg.json b/ports/dartsim/vcpkg.json
index 0029e6c3c..5f4c00b18 100644
--- a/ports/dartsim/vcpkg.json
+++ b/ports/dartsim/vcpkg.json
@@ -1,6 +1,7 @@
{
"name": "dartsim",
- "version-string": "6.9.4",
+ "version": "6.9.4",
+ "port-version": 1,
"description": "Dynamic Animation and Robotics Toolkit",
"homepage": "https://dartsim.github.io/",
"dependencies": [