Skip to content

Commit

Permalink
rvff-cxx -> rvff_cxx
Browse files Browse the repository at this point in the history
  • Loading branch information
TheWillard committed Oct 5, 2024
1 parent 69a65ab commit 6cc467c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ FetchContent_MakeAvailable(Corrosion)
# Import targets defined in a package or workspace manifest `Cargo.toml` file

corrosion_import_crate(MANIFEST_PATH rvff-cxx/Cargo.toml)
corrosion_add_cxxbridge(rust-lib CRATE rvff-cxx MANIFEST_PATH rvff-cxx FILES lib.rs)
corrosion_add_cxxbridge(rust-lib CRATE rvff_cxx MANIFEST_PATH rvff-cxx FILES lib.rs)

include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(${INTERCEPT_PLUGIN_NAME} SHARED ${INTERCEPT_PLUGIN_SOURCES} ${INTERCEPT_HOST_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/version.cpp)
Expand All @@ -118,7 +118,7 @@ endif()

if(MSVC)
# Note: This is required because we use `cxx` which uses `cc` to compile and link C++ code.
corrosion_set_env_vars(rvff-cxx "CFLAGS=-MD$<$<CONFIG:Debug>:d>" "CXXFLAGS=-MD$<$<CONFIG:Debug>:d>")
corrosion_set_env_vars(rvff_cxx "CFLAGS=-MD$<$<CONFIG:Debug>:d>" "CXXFLAGS=-MD$<$<CONFIG:Debug>:d>")
endif()

include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${INTERCEPT_INCLUDE_PATH})
Expand Down Expand Up @@ -146,9 +146,9 @@ if("${PLUGIN_FOLDER}" STREQUAL "")
SET(PLUGIN_FOLDER "${ARMA_PATH}\\@grad_meh\\intercept")
endif()

message("asfjask: " ${CMAKE_BUILD_TYPE})
message("asfjask: " ${USE_STATIC_LINKING})
message("asfjask: " ${CMAKE_INSTALL_PREFIX})
message("Build Type: " ${CMAKE_BUILD_TYPE})
message("Use Static Linking: " ${USE_STATIC_LINKING})
message("Cmake Install Prefix: " ${CMAKE_INSTALL_PREFIX})

message("grad_meh plugin folder: " ${PLUGIN_FOLDER})
if(NOT "${PLUGIN_FOLDER}" STREQUAL "")
Expand Down
2 changes: 1 addition & 1 deletion src/rvff-cxx
Submodule rvff-cxx updated 1 files
+1 −1 Cargo.toml

0 comments on commit 6cc467c

Please sign in to comment.