[simbody] uniform target names and add usage #28863
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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. | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| Simbody provides CMake targets: | ||
|
|
||
| find_package(Simbody CONFIG REQUIRED) | ||
| target_link_libraries(main PRIVATE SimTKcommon SimTKmath SimTKsimbody) | ||
|
There was a problem hiding this comment. I would guess that the actual usage only needs SimTKsimbody(-static), if properly exported. There was a problem hiding this comment. The targets are indeed incremental (SimTKcommon ⊂ SimTKmath ⊂ SimTKsimbody). Though each target is seldom usable and I have seen libraries relying on a subset specifically. Unless CMake can strip correctly simbody if someone use math only, then IMO usage file should reflect that. |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here and for SimTKcommon, SimTKmath:
The maintainer guidelines allow to rename binaries in order to have the same name for static vs. dynamic.
But IMO this doesn't extend to renaming exported CMake targets. The usage suggestion can use generator expressions, cf. zstd.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok fine by me, but then does it even matter to rename the libraries if it is not related? The downstream user would just rely on the usage file no matter the library name. I would completely remove the patch to thin back the port in that case.