From 6cc467c077d21691fc853ef0f5e816f4f930bd2d Mon Sep 17 00:00:00 2001 From: Willard Date: Sat, 5 Oct 2024 17:34:46 +0200 Subject: [PATCH] rvff-cxx -> rvff_cxx --- src/CMakeLists.txt | 10 +++++----- src/rvff-cxx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ba41145..001a425 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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) @@ -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$<$:d>" "CXXFLAGS=-MD$<$:d>") + corrosion_set_env_vars(rvff_cxx "CFLAGS=-MD$<$:d>" "CXXFLAGS=-MD$<$:d>") endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${INTERCEPT_INCLUDE_PATH}) @@ -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 "") diff --git a/src/rvff-cxx b/src/rvff-cxx index ba3029d..3b8eff3 160000 --- a/src/rvff-cxx +++ b/src/rvff-cxx @@ -1 +1 @@ -Subproject commit ba3029dbf020789a305a534ee8adc9912383270b +Subproject commit 3b8eff3adb1ba70999940a01a4b263f0b24f5852