From 389274aee9b6d2c9760d30cab3e251eec2ad8642 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Sat, 25 May 2024 19:29:00 -0400 Subject: [PATCH] Correct path to the staticlib --- src/fcmp/fcmp_rust/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/fcmp/fcmp_rust/CMakeLists.txt b/src/fcmp/fcmp_rust/CMakeLists.txt index ae97858b6..df0a6018b 100644 --- a/src/fcmp/fcmp_rust/CMakeLists.txt +++ b/src/fcmp/fcmp_rust/CMakeLists.txt @@ -26,6 +26,12 @@ # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +if(ARCH_ID MATCHES "arm64") + set(RUST_ARCH "aarch64") +else() + set(RUST_ARCH "${ARCH_ID}") +endif() + if(MINGW) set(RUST_PLATFORM "pc-windows") set(RUST_TOOLCHAIN "-gnu") @@ -68,7 +74,7 @@ else() endif() endif() -set(RUST_TARGET "${ARCH_ID}-${RUST_PLATFORM}${RUST_TOOLCHAIN}") +set(RUST_TARGET "${RUST_ARCH}-${RUST_PLATFORM}${RUST_TOOLCHAIN}") if (CMAKE_BUILD_TYPE STREQUAL "Debug") set(CARGO_CMD cargo build --target "${RUST_TARGET}") @@ -94,7 +100,7 @@ add_custom_command( OUTPUT ${FCMP_RUST_LIB} COMMAND CARGO_TARGET_DIR=${CMAKE_CURRENT_BINARY_DIR} ${CARGO_CMD} COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/fcmp++.h ${FCMP_RUST_HEADER} - COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_DIR}/libfcmp_rust.a ${FCMP_RUST_LIB} + COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/${RUST_TARGET}/${TARGET_DIR}/libfcmp_rust.a ${FCMP_RUST_LIB} COMMAND echo "Finished copying fcmp rust targets" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM