diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2021-08-10 00:07:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-09 09:07:37 -0700 |
| commit | e1e7daf3abb8b55b8034360263e1c0d29429fdff (patch) | |
| tree | cf8bab6b67de02587d9c612c3f739955f3dc2256 /ports/rbdl-orb | |
| parent | 7893cbb48a8e639e6a8d63819ca7610327907de8 (diff) | |
| download | vcpkg-e1e7daf3abb8b55b8034360263e1c0d29429fdff.tar.gz vcpkg-e1e7daf3abb8b55b8034360263e1c0d29429fdff.zip | |
[vcpkg baseline][rbdl-orb/rbdl/ptex] file conflicts, skip rbdl-orb in CI testing (#19453)
* [vcpkg baseline][rbdl-orb/rbdl] file conflicts, skip rbdl-orb in Ci testing
* [ptex] Add DISABLE_PARALLEL_CONFIGURE
* Update the baseline version
* Add missing quotes
* Update the baseline version
Diffstat (limited to 'ports/rbdl-orb')
| -rw-r--r-- | ports/rbdl-orb/portfile.cmake | 20 | ||||
| -rw-r--r-- | ports/rbdl-orb/vcpkg.json | 5 |
2 files changed, 12 insertions, 13 deletions
diff --git a/ports/rbdl-orb/portfile.cmake b/ports/rbdl-orb/portfile.cmake index ac829c62c..02da8be07 100644 --- a/ports/rbdl-orb/portfile.cmake +++ b/ports/rbdl-orb/portfile.cmake @@ -1,12 +1,16 @@ -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC)
-
+if (EXISTS "${CURRENT_INSTALLED_DIR}/share/rbdl/copyright")
+ message(FATAL_ERROR "${PORT} conflict with rbdl, please remove rbdl before install ${PORT}.")
+endif()
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC)
+
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ORB-HD/rbdl-orb
REF b22abab856a90dbc62e6b2e79f148bd383b5ce43
SHA512 744a60145243454a9d148971d998ae7a3cc5b9d66131b5d6f3c7be80d6c9ef8b8bf4390b9d1b90b14be6c619c2e1d14c7c6104b3ca6e606e22e3581b548e4f9d
HEAD_REF master
-)
+)
vcpkg_from_github(
OUT_SOURCE_PATH PARSER_SOURCE_PATH
@@ -17,10 +21,10 @@ vcpkg_from_github( if(NOT EXISTS "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser/CMakeLists.txt")
file(REMOVE_RECURSE "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser")
file(RENAME "${PARSER_SOURCE_PATH}" "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser")
-endif()
+endif()
vcpkg_cmake_configure(
- SOURCE_PATH ${SOURCE_PATH}
+ SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DRBDL_BUILD_STATIC=${RBDL_STATIC}
-DRBDL_BUILD_ADDON_LUAMODEL=ON
@@ -31,10 +35,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install()
-# # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-# # Remove duplicated include directory
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_copy_pdbs()
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/rbdl-orb/vcpkg.json b/ports/rbdl-orb/vcpkg.json index 2a1cd6beb..8b460557a 100644 --- a/ports/rbdl-orb/vcpkg.json +++ b/ports/rbdl-orb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rbdl-orb", "version": "3.0.0", + "port-version": 1, "description": "Rigid Body Dynamics Library - ORB", "homepage": "https://github.com/orb-hd/rbdl-orb", "dependencies": [ @@ -10,10 +11,6 @@ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } |