[simbody] set uniform target names and add usage (#28863)

This commit is contained in:
Fabien Péan 2023-01-13 00:28:56 +01:00 committed by GitHub
parent a61e638f3a
commit 4c5be28bfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 101 additions and 7 deletions

View File

@ -0,0 +1,84 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1995170..7ddb018 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,25 +174,25 @@ FORCE)
set(SimTKCOMMON_SHARED_LIBRARY ${SimTKCOMMON_LIBRARY_NAME})
-set(SimTKCOMMON_STATIC_LIBRARY ${SimTKCOMMON_LIBRARY_NAME}_static)
+set(SimTKCOMMON_STATIC_LIBRARY ${SimTKCOMMON_LIBRARY_NAME})
set(SimTKCOMMON_LIBRARY_NAME_VN ${NS}SimTKcommon${VN})
set(SimTKCOMMON_SHARED_LIBRARY_VN ${SimTKCOMMON_LIBRARY_NAME_VN})
-set(SimTKCOMMON_STATIC_LIBRARY_VN ${SimTKCOMMON_LIBRARY_NAME_VN}_static)
+set(SimTKCOMMON_STATIC_LIBRARY_VN ${SimTKCOMMON_LIBRARY_NAME_VN})
set(SimTKMATH_SHARED_LIBRARY ${SimTKMATH_LIBRARY_NAME})
-set(SimTKMATH_STATIC_LIBRARY ${SimTKMATH_LIBRARY_NAME}_static)
+set(SimTKMATH_STATIC_LIBRARY ${SimTKMATH_LIBRARY_NAME})
set(SimTKMATH_LIBRARY_NAME_VN ${NS}SimTKmath${VN})
set(SimTKMATH_SHARED_LIBRARY_VN ${SimTKMATH_LIBRARY_NAME_VN})
-set(SimTKMATH_STATIC_LIBRARY_VN ${SimTKMATH_LIBRARY_NAME_VN}_static)
+set(SimTKMATH_STATIC_LIBRARY_VN ${SimTKMATH_LIBRARY_NAME_VN})
set(SimTKSIMBODY_SHARED_LIBRARY ${SimTKSIMBODY_LIBRARY_NAME})
-set(SimTKSIMBODY_STATIC_LIBRARY ${SimTKSIMBODY_LIBRARY_NAME}_static)
+set(SimTKSIMBODY_STATIC_LIBRARY ${SimTKSIMBODY_LIBRARY_NAME})
set(SimTKSIMBODY_LIBRARY_NAME_VN ${NS}SimTKsimbody${VN})
set(SimTKSIMBODY_SHARED_LIBRARY_VN ${SimTKSIMBODY_LIBRARY_NAME_VN})
-set(SimTKSIMBODY_STATIC_LIBRARY_VN ${SimTKSIMBODY_LIBRARY_NAME_VN}_static)
+set(SimTKSIMBODY_STATIC_LIBRARY_VN ${SimTKSIMBODY_LIBRARY_NAME_VN})
# Caution: this variable is automatically created by the CMake
diff --git a/SimTKcommon/CMakeLists.txt b/SimTKcommon/CMakeLists.txt
index 47839f5..84ad865 100644
--- a/SimTKcommon/CMakeLists.txt
+++ b/SimTKcommon/CMakeLists.txt
@@ -86,9 +86,9 @@ endif(NEED_QUOTES)
# -DSimTKcommon_EXPORTS defined automatically when Windows DLL build is being done.
set(SHARED_TARGET ${SimTKCOMMON_LIBRARY_NAME})
-set(STATIC_TARGET ${SimTKCOMMON_LIBRARY_NAME}_static)
+set(STATIC_TARGET ${SimTKCOMMON_LIBRARY_NAME})
set(SHARED_TARGET_VN ${SimTKCOMMON_LIBRARY_NAME}${VN})
-set(STATIC_TARGET_VN ${SimTKCOMMON_LIBRARY_NAME}${VN}_static)
+set(STATIC_TARGET_VN ${SimTKCOMMON_LIBRARY_NAME}${VN})
## Test against the unversioned libraries if they are being build;
## otherwise against the versioned libraries.
diff --git a/SimTKmath/CMakeLists.txt b/SimTKmath/CMakeLists.txt
index f5c82ae..d3ee9bf 100644
--- a/SimTKmath/CMakeLists.txt
+++ b/SimTKmath/CMakeLists.txt
@@ -79,9 +79,9 @@ endif(NEED_QUOTES)
# -Dsimmath_EXPORTS defined automatically when Windows DLL build is being done.
set(SHARED_TARGET ${SimTKMATH_LIBRARY_NAME})
-set(STATIC_TARGET ${SimTKMATH_LIBRARY_NAME}_static)
+set(STATIC_TARGET ${SimTKMATH_LIBRARY_NAME})
set(SHARED_TARGET_VN ${SimTKMATH_LIBRARY_NAME}${VN})
-set(STATIC_TARGET_VN ${SimTKMATH_LIBRARY_NAME}${VN}_static)
+set(STATIC_TARGET_VN ${SimTKMATH_LIBRARY_NAME}${VN})
## Test against the unversioned libraries if they are being built;
## otherwise against the versioned libraries.
diff --git a/Simbody/CMakeLists.txt b/Simbody/CMakeLists.txt
index 062c2b9..e320f57 100644
--- a/Simbody/CMakeLists.txt
+++ b/Simbody/CMakeLists.txt
@@ -42,9 +42,9 @@ add_definitions(-DSimTK_SIMBODY_LIBRARY_NAME=${SimTKSIMBODY_LIBRARY_NAME}
set(SHARED_TARGET ${SimTKSIMBODY_LIBRARY_NAME})
-set(STATIC_TARGET ${SimTKSIMBODY_LIBRARY_NAME}_static)
+set(STATIC_TARGET ${SimTKSIMBODY_LIBRARY_NAME})
set(SHARED_TARGET_VN ${SimTKSIMBODY_LIBRARY_NAME}${VN})
-set(STATIC_TARGET_VN ${SimTKSIMBODY_LIBRARY_NAME}${VN}_static)
+set(STATIC_TARGET_VN ${SimTKSIMBODY_LIBRARY_NAME}${VN})
## Test against the unversioned libraries if they are being built;
## otherwise against the versioned libraries.

View File

@ -2,9 +2,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO simbody/simbody
REF 040562785acd4b6d9d26ea6762d5c80075e0c474
SHA512 b803ed45fbaa60c5af601ac2d0be2a109eae19428d72ab06952403e12116ee08592014d85accad8e6a64aed6bb0afbd6f9dff6588c4b22da65fd1bac067f8662
REF 462b2a6dbb8794db2922d72f52b29b488a178ebc
SHA512 e2b1837e0a04461ebc94e80f5e8aa29f874a1113383db8b24e77b0c9413c4a6bab0299c6a9b2f07147e82ef01a765fed6d6455d5bd059882c646830dd8d1b224
HEAD_REF master
PATCHES
common-name-libs.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBRARIES)
@ -38,5 +40,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc")
vcpkg_fixup_pkgconfig()
# Handle copyright
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

4
ports/simbody/usage Normal file
View File

@ -0,0 +1,4 @@
Simbody provides CMake targets:
find_package(Simbody CONFIG REQUIRED)
target_link_libraries(main PRIVATE SimTKcommon SimTKmath SimTKsimbody)

View File

@ -1,7 +1,6 @@
{
"name": "simbody",
"version-date": "2022-01-04",
"port-version": 2,
"version-date": "2023-01-10",
"description": "High-performance C++ multibody dynamics/physics library for simulating articulated biomechanical and mechanical systems like vehicles, robots, and the human skeleton.",
"homepage": "https://simtk.org/home/simbody",
"license": "Apache-2.0",

View File

@ -7057,8 +7057,8 @@
"port-version": 1
},
"simbody": {
"baseline": "2022-01-04",
"port-version": 2
"baseline": "2023-01-10",
"port-version": 0
},
"simd": {
"baseline": "5.1.119",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c8b6a6d70b06b78e445b3c80cbded18415e22a7c",
"version-date": "2023-01-10",
"port-version": 0
},
{
"git-tree": "077f05087ad6704e1febb44e27273550028c5729",
"version-date": "2022-01-04",