mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-15 11:59:01 +08:00
4324a46e78
<!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. --> Fixes https://github.com/microsoft/vcpkg/issues/36162 Export the targets for usage. Usage test passed with following triplets: ``` x86-windows x64-windows x64-windows-static ``` <!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. --> - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [ ] ~~Any patches that are no longer applied are deleted from the port's directory.~~ - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. <!-- If this PR adds a new port, please uncomment and fill out this checklist: - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines. - [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html). - [ ] The versioning scheme in `vcpkg.json` matches what upstream says. - [ ] The license declaration in `vcpkg.json` matches what upstream says. - [ ] The installed as the "copyright" file matches what upstream says. - [ ] The source code of the component installed comes from an authoritative source. - [ ] The generated "usage text" is accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context. - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [ ] Only one version is in the new port's versions file. - [ ] Only one version is added to each modified port's versions file. END OF NEW PORT CHECKLIST (delete this line) -->
41 lines
2.0 KiB
Diff
41 lines
2.0 KiB
Diff
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 34882d1..d47c303 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -31,7 +31,9 @@ if(BUILD_SHARED)
|
|
# need to explicitly link to the math library because the CMake/Android toolchains may not do it automatically
|
|
target_link_libraries(chipmunk m)
|
|
endif(ANDROID OR UNIX)
|
|
- install(TARGETS chipmunk RUNTIME DESTINATION ${BIN_INSTALL_DIR}
|
|
+ target_include_directories(chipmunk INTERFACE $<INSTALL_INTERFACE:include>)
|
|
+ install(TARGETS chipmunk EXPORT unofficial-chipmunk-config
|
|
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
|
|
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
|
|
ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
|
|
endif(BUILD_SHARED)
|
|
@@ -46,9 +48,12 @@ if(BUILD_STATIC)
|
|
set_target_properties(chipmunk_static PROPERTIES LINKER_LANGUAGE CXX)
|
|
endif(MSVC)
|
|
# Sets chipmunk_static to output "libchipmunk.a" not "libchipmunk_static.a"
|
|
- set_target_properties(chipmunk_static PROPERTIES OUTPUT_NAME chipmunk)
|
|
+ set_target_properties(chipmunk_static PROPERTIES OUTPUT_NAME chipmunk EXPORT_NAME chipmunk)
|
|
+ target_include_directories(chipmunk_static INTERFACE $<INSTALL_INTERFACE:include>)
|
|
if(INSTALL_STATIC)
|
|
- install(TARGETS chipmunk_static ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
|
|
+ install(TARGETS chipmunk_static EXPORT unofficial-chipmunk-config
|
|
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
|
|
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
|
|
endif(INSTALL_STATIC)
|
|
endif(BUILD_STATIC)
|
|
|
|
@@ -57,3 +62,9 @@ if(BUILD_SHARED OR INSTALL_STATIC)
|
|
install(FILES ${chipmunk_public_header} DESTINATION include/chipmunk)
|
|
install(FILES ${chipmunk_constraint_header} DESTINATION include/chipmunk/constraints)
|
|
endif(BUILD_SHARED OR INSTALL_STATIC)
|
|
+
|
|
+install(EXPORT unofficial-chipmunk-config
|
|
+ FILE unofficial-chipmunk-config.cmake
|
|
+ NAMESPACE unofficial::chipmunk::
|
|
+ DESTINATION share/unofficial-chipmunk
|
|
+)
|