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

Jump to bottom

[rbdl] Add new port #13884

Merged
merged 29 commits into from Oct 12, 2020
Merged

[rbdl] Add new port #13884

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
800e4d0
Add RBDL core support (without features)
RDCH106 Oct 5, 2020
ab9ff99
Fix port version
RDCH106 Oct 5, 2020
b7ae20a
Add supports field to CONTROL
RDCH106 Oct 5, 2020
65a8100
Mark rbdl:x64-uwp as fail in the CI baseline
RDCH106 Oct 6, 2020
9d714fa
Update ports/rbdl/portfile.cmake
RDCH106 Oct 9, 2020
09b9e7a
Update ports/rbdl/portfile.cmake
RDCH106 Oct 9, 2020
63cdee8
Update ports/rbdl/portfile.cmake
RDCH106 Oct 9, 2020
7df0d4b
Update ports/rbdl/portfile.cmake
RDCH106 Oct 9, 2020
5276fde
Update ports/rbdl/portfile.cmake
RDCH106 Oct 9, 2020
c650174
⏰ Temporal removing of Supports field
RDCH106 Oct 9, 2020
610423f
Update ports/rbdl/portfile.cmake
RDCH106 Oct 9, 2020
37d36b9
Merge branch 'feature/rbdl' of https://github.com/RDCH106/vcpkg into …
RDCH106 Oct 9, 2020
8e8e969
Revert "Mark rbdl:x64-uwp as fail in the CI baseline"
RDCH106 Oct 9, 2020
68d07a9
Add Supports field
RDCH106 Oct 9, 2020
4d7d5ff
Update ports/rbdl/001_x64_number_of_sections_exceeded_in_object_file_…
RDCH106 Oct 10, 2020
faab8a5
Update ports/rbdl/portfile.cmake
RDCH106 Oct 10, 2020
28288d1
Update ports/rbdl/portfile.cmake
RDCH106 Oct 10, 2020
dd7aeca
Remove vcpkg_fail_port_install
RDCH106 Oct 10, 2020
b62ba89
Remove Supports field
RDCH106 Oct 10, 2020
0e1cd7a
Revert "Remove Supports field"
RDCH106 Oct 10, 2020
ae89760
Revert "Remove vcpkg_fail_port_install"
RDCH106 Oct 10, 2020
cc74a6e
Revert "Revert "Remove Supports field""
RDCH106 Oct 10, 2020
ebc0833
Revert "Revert "Remove vcpkg_fail_port_install""
RDCH106 Oct 10, 2020
1425dd7
Fix 001_x64_number_of_sections_exceeded_in_object_file_patch.diff
RDCH106 Oct 10, 2020
13927fc
Remove vcpkg_fixup_cmake_targets
RDCH106 Oct 10, 2020
8f385d4
Disable manual handling for dynamic install target
RDCH106 Oct 10, 2020
7f79ab0
♻️ Clean code
RDCH106 Oct 10, 2020
32a0cfa
Add 002_runtime_destination_for_not_static_build.diff patch
RDCH106 Oct 10, 2020
0ebd506
Revert "Add 002_runtime_destination_for_not_static_build.diff patch"
RDCH106 Oct 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/rbdl/001_x64_number_of_sections_exceeded_in_object_file_patch.diff
View file
Open in desktop
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2db532da..42c004380 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,6 +112,8 @@ SET ( RBDL_SOURCES
src/Kinematics.cc
)

+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
RDCH106 marked this conversation as resolved.
Show resolved Hide resolved
+
IF (MSVC AND NOT RBDL_BUILD_STATIC)
MESSAGE (FATAL_ERROR, "Compiling RBDL as a DLL currently not supported. Please enable RBDL_BUILD_STATIC.")
ENDIF (MSVC AND NOT RBDL_BUILD_STATIC)
7 changes: 7 additions & 0 deletions ports/rbdl/CONTROL
View file
Open in desktop
@@ -0,0 +1,7 @@
Source: rbdl
Version: 2.6.0
Port-Version: 0
NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
Homepage: https://github.com/rbdl/rbdl
Description: Rigid Body Dynamics Library
Build-Depends: eigen3
Supports: (x86|x64) & (windows|linux)
NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
51 changes: 51 additions & 0 deletions ports/rbdl/portfile.cmake
View file
Open in desktop
@@ -0,0 +1,51 @@
set(VERSION 2.6.0)

NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
set(RBDL_STATIC ON)
else()
set(RBDL_STATIC OFF)
endif()

vcpkg_from_github(ARCHIVE
OUT_SOURCE_PATH SOURCE_PATH
REPO rbdl/rbdl
REF v2.6.0
SHA512 7b5fd03c0090277f295a28a1ff0542cd8cff76dda4379b3edc61ca3d868bf77d8b4882f81865fdffd0cf756c613fe55238b29a83bc163fc32aa94aa9d5781480
HEAD_REF master
PATCHES 001_x64_number_of_sections_exceeded_in_object_file_patch.diff
)


vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
OPTIONS
-DRBDL_BUILD_STATIC=${RBDL_STATIC}
)

vcpkg_install_cmake()

if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
if(VCPKG_TARGET_IS_WINDOWS)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/rbdl.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/rbdl.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
endif()
endif()
endif()

file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/share/rbdl)
RDCH106 marked this conversation as resolved.
Show resolved Hide resolved

# # Moves all .cmake files from /debug/share/rbdl/ to /share/rbdl/
# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details
RDCH106 marked this conversation as resolved.
Show resolved Hide resolved
vcpkg_fixup_cmake_targets()

# # 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()
1 change: 1 addition & 0 deletions scripts/ci.baseline.txt
View file
Open in desktop
Expand Up @@ -1503,6 +1503,7 @@ rapidstring:x86-windows=fail
raylib:arm64-windows=fail
raylib:arm-uwp=fail
raylib:x64-uwp=fail
rbdl:x64-uwp=fail
NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
readline:arm-uwp=fail
readline:x64-uwp=fail
readline-win32:arm-uwp=fail
Expand Down