-
Notifications
You must be signed in to change notification settings - Fork 7.5k
[klein] create a new port #18279
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.
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
Merged
Merged
[klein] create a new port #18279
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
09aa141
[klein] new port
JPMMaia b71eb3b
[klein] Replace version-string by version
JPMMaia de77fb8
[klein] Add call to vcpkg_fixup_pkgconfig()
JPMMaia b295539
[klein] Replace klein by ${PORT}
JPMMaia 383af02
[klein] Add patch to avoid using FetchContent
JPMMaia a97b8a5
[klein] Change version to version-date
JPMMaia b101ea0
update version
JonLiu1993 c356603
Apply suggestions from code review
JPMMaia 510dceb
Update git-tree version
JPMMaia File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index c5d6f3f..a3ba161 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -29,16 +29,7 @@ endif() | ||
| option(KLEIN_BUILD_SYM "Enable compilation of symbolic Klein utility" ON) | ||
| option(KLEIN_BUILD_C_BINDINGS "Enable compilation of the Klein C bindings" ON) | ||
|
|
||
| -include(FetchContent) | ||
| -FetchContent_Declare( | ||
| - simde | ||
| - GIT_REPOSITORY https://github.com/simd-everywhere/simde | ||
| - GIT_TAG v0.7.2 | ||
| - GIT_SHALLOW ON | ||
| -) | ||
| -FetchContent_GetProperties(simde) | ||
| -if(NOT simde_POPULATED) | ||
| - FetchContent_Populate(simde) | ||
| -endif() | ||
| +find_path(SIMDE_INCLUDE_DIR "simde/x86/sse4.1.h" REQUIRED) | ||
| +set(simde_SOURCE_DIR ${SIMDE_INCLUDE_DIR}/simde) | ||
|
|
||
| # The default platform and instruction set is x86 SSE3 |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO jeremyong/klein | ||
| REF 92023c6a946af84e716deb1488cad22048d3e08d | ||
| SHA512 5d12ae143f07173992a6f9aa90539c4cb6c895a7169e5c086a10f78a31f7b2c9d64faf5ce1db014bd3badd92d24ff612dd2d2dc2f7508baac59307e3dccb6ebe | ||
| HEAD_REF master | ||
| PATCHES | ||
| "find_simde_first.patch" | ||
| ) | ||
|
|
||
| vcpkg_cmake_configure( | ||
| SOURCE_PATH ${SOURCE_PATH} | ||
| OPTIONS | ||
| -DKLEIN_ENABLE_PERF=OFF | ||
| -DKLEIN_ENABLE_TESTS=OFF | ||
| -DKLEIN_VALIDATE=OFF | ||
| -DKLEIN_BUILD_SYM=OFF | ||
| -DKLEIN_BUILD_C_BINDINGS=OFF | ||
| -DKLEIN_INSTALL=ON | ||
| ) | ||
|
|
||
| vcpkg_cmake_install() | ||
| vcpkg_fixup_pkgconfig() | ||
|
|
||
| file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) | ||
| file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) | ||
|
|
||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| The package klein:x64-windows provides CMake targets: | ||
|
|
||
| find_package(klein CONFIG REQUIRED) | ||
| target_link_libraries(main PRIVATE klein::klein) | ||
|
|
||
| # Or use the C++ 11 version | ||
| target_link_libraries(main PRIVATE klein::klein_cxx11) | ||
|
|
||
| # Or use the SSE4.1 version | ||
| target_link_libraries(main PRIVATE klein::klein_sse42) |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "name": "klein", | ||
| "version-date": "2021-05-09", | ||
| "description": "Klein is an implementation of P(R*_{3, 0, 1}), aka 3D Projective Geometric Algebra. It is designed for applications that demand high-throughput (animation libraries, kinematic solvers, etc).", | ||
| "dependencies": [ | ||
| "simde", | ||
| { | ||
| "name": "vcpkg-cmake", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake-config", | ||
| "host": true | ||
| } | ||
| ] | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "versions": [ | ||
| { | ||
| "git-tree": "5a367eafd82860f61245c54f64306b35a9e0978c", | ||
| "version-date": "2021-05-09", | ||
| "port-version": 0 | ||
| } | ||
| ] | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.