Skip to content

Commit

Permalink
Remove rust portion.
Browse files Browse the repository at this point in the history
Consensus is that we're not going to move in this direction -- if
anything, we'll rewrite it in rust.
  • Loading branch information
kitlith committed Jul 2, 2023
1 parent e04191f commit b276a87
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 234 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,22 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest]

steps:
- uses: actions/checkout@v2
with:
submodules: true
# shallow clone doesn't pull tags, unfortunately.
fetch-depth: 0

- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
# components: rustfmt, clippy

- uses: lukka/get-cmake@latest

- name: vcpkg setup/restore artifacts
uses: lukka/run-vcpkg@v10
id: runvcpkg
with:
vcpkgJsonGlob: 'vcpkg.json'

- name: Prints output of run-vcpkg's action.
run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' "

Expand Down Expand Up @@ -79,7 +72,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
path: ${{ env.artifactPath }}

- name: Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
Expand Down
7 changes: 2 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,15 @@ find_package(simdjson CONFIG REQUIRED)
set(protos_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/protos)
file(MAKE_DIRECTORY "${protos_OUTPUT_DIR}")

include_directories(${CMAKE_BINARY_DIR}/rust_part)
include_directories(include)

add_subdirectory(rust_part)

set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
set(CMAKE_INSTALL_RPATH $ORIGIN)

# Project
add_executable("${PROJECT_NAME}" "src/main.cpp" "src/pathtools_excerpt.cpp" "src/pathtools_excerpt.h" "src/matrix_utils.cpp" "src/matrix_utils.h" "src/bridge.cpp" "src/bridge.hpp" "src/setup.cpp" "src/setup.hpp" "ProtobufMessages.proto" "src/cxx_test.cpp")
target_link_libraries("${PROJECT_NAME}" PRIVATE "${OPENVR_LIB}" fmt::fmt protobuf::libprotobuf simdjson::simdjson rust_part)
add_executable("${PROJECT_NAME}" "src/main.cpp" "src/pathtools_excerpt.cpp" "src/pathtools_excerpt.h" "src/matrix_utils.cpp" "src/matrix_utils.h" "src/bridge.cpp" "src/bridge.hpp" "src/setup.cpp" "src/setup.hpp" "ProtobufMessages.proto")
target_link_libraries("${PROJECT_NAME}" PRIVATE "${OPENVR_LIB}" fmt::fmt protobuf::libprotobuf simdjson::simdjson)
protobuf_generate(TARGET "${PROJECT_NAME}" LANGUAGE cpp PROTOC_OUT_DIR ${protos_OUTPUT_DIR})
target_include_directories("${PROJECT_NAME}" PUBLIC ${protos_OUTPUT_DIR} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_compile_features("${PROJECT_NAME}" PRIVATE cxx_std_17)
Expand Down
2 changes: 0 additions & 2 deletions rust_part/.gitignore

This file was deleted.

49 changes: 0 additions & 49 deletions rust_part/CMakeLists.txt

This file was deleted.

15 changes: 0 additions & 15 deletions rust_part/Cargo.toml

This file was deleted.

5 changes: 0 additions & 5 deletions rust_part/build.rs

This file was deleted.

100 changes: 0 additions & 100 deletions rust_part/src/lib.rs

This file was deleted.

48 changes: 0 additions & 48 deletions src/cxx_test.cpp

This file was deleted.

0 comments on commit b276a87

Please sign in to comment.