cmake: mtmd: install PUBLIC_HEADERs and allow static linking (#13902) #13903
Conversation
This file contains hidden or 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
65a
changed the title
Contributor
Author
|
Found an existing typo in CMakeLists.txt. I'll push that squashed into the commit once it's clear the approach works on Windows, which was causing some checks to fail. |
Separates out header installation and performs it regardless of build shared libs or not. Adds mtmd STATIC objects, installing those if BUILD_SHARED_LIBS is off. This should allow for static linking without breaking build encapsulation or visibility, and install the headers as before for shared libs. Fixes a possible type when BUILD_SHARED is enabled (mtmd vs mtmd_shared as the TARGET_OBJECTS target)
ngxson
reviewed
May 30, 2025
|
|
||
| set(MTMD_PUBLIC_HEADERS | ||
| "mtmd.h" | ||
| "clip.h") |
Collaborator
There was a problem hiding this comment.
clip.h is not a public header, we should remove it
Comment on lines
+51
to
+57
| else() | ||
| add_library(mtmd_static STATIC $<TARGET_OBJECTS:mtmd>) | ||
| set_target_properties(mtmd_static PROPERTIES PUBLIC_HEADER "${MTMD_PUBLIC_HEADERS}") | ||
| add_library(mtmd_helper_static STATIC $<TARGET_OBJECTS:mtmd_helper>) | ||
| set_target_properties(mtmd_helper_static PROPERTIES PUBLIC_HEADER "${MTMD_HELPER_PUBLIC_HEADERS}") | ||
| install(TARGETS mtmd_static LIBRARY PUBLIC_HEADER PUBLIC_HEADER) | ||
| install(TARGETS mtmd_helper_static LIBRARY PUBLIC_HEADER) |
Collaborator
There was a problem hiding this comment.
I think this may be redundant. If anything in the project need mtmd_helper, we can simply link the target binary with it
Collaborator
There was a problem hiding this comment.
for example:
target_link_libraries(${TARGET} PRIVATE common mtmd mtmd_helper ${CMAKE_THREAD_LIBS_INIT})
So, nothing need to be STATIC
Contributor
Author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #13902
Separates out header installation and performs it regardless of build shared libs or not. Adds STATIC mtmd objects to link to (same name as before *_static.a), installing those if BUILD_SHARED_LIBS is off. This should allow for static linking without breaking build encapsulation or visibility, and install the headers as before for shared libs.
Make sure to read the contributing guidelines before submitting a PR