From b1af265cafd96baa60a26f52f2b74a2d8aadc1af Mon Sep 17 00:00:00 2001 From: Jakub Ptak Date: Mon, 15 Aug 2022 12:25:52 +0200 Subject: [PATCH 1/3] Add copying any shared lib, not only .so files --- .gitignore | 1 + src/starkware/crypto/ffi/js/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4022a05..058bf82 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /.vscode/ node_modules *.so +*.dylib package-lock.json diff --git a/src/starkware/crypto/ffi/js/CMakeLists.txt b/src/starkware/crypto/ffi/js/CMakeLists.txt index 689a5b5..e333852 100644 --- a/src/starkware/crypto/ffi/js/CMakeLists.txt +++ b/src/starkware/crypto/ffi/js/CMakeLists.txt @@ -1,14 +1,14 @@ add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/libcrypto_c_exports.so + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/libcrypto COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_BINARY_DIR}/../libcrypto_c_exports.so - ${CMAKE_CURRENT_SOURCE_DIR}/libcrypto_c_exports.so + ${CMAKE_CURRENT_BINARY_DIR}/../libcrypto_c_exports.* + ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS crypto_c_exports ) add_custom_target(js_test ALL - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libcrypto_c_exports.so + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libcrypto ) add_test( From ab036087eb5b9fb2ceeb662a96c59d8c88644485 Mon Sep 17 00:00:00 2001 From: Jakub Ptak Date: Thu, 8 Sep 2022 12:21:26 +0200 Subject: [PATCH 2/3] Use CMAKE_SHARED_LIBRARY_SUFFIX to copy the right shared library file --- src/starkware/crypto/ffi/js/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/starkware/crypto/ffi/js/CMakeLists.txt b/src/starkware/crypto/ffi/js/CMakeLists.txt index e333852..5d23997 100644 --- a/src/starkware/crypto/ffi/js/CMakeLists.txt +++ b/src/starkware/crypto/ffi/js/CMakeLists.txt @@ -1,14 +1,14 @@ add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/libcrypto + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/libcrypto${CMAKE_SHARED_LIBRARY_SUFFIX} COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_BINARY_DIR}/../libcrypto_c_exports.* + ${CMAKE_CURRENT_BINARY_DIR}/../libcrypto_c_exports${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS crypto_c_exports ) add_custom_target(js_test ALL - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libcrypto + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libcrypto${CMAKE_SHARED_LIBRARY_SUFFIX} ) add_test( From b00554ef219d54761e47837b617b7351ed792574 Mon Sep 17 00:00:00 2001 From: Jakub Ptak Date: Thu, 15 Sep 2022 09:48:16 +0200 Subject: [PATCH 3/3] Remove CMAKE_CURRENT_SOURCE_DIR from custom command --- src/starkware/crypto/ffi/js/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/starkware/crypto/ffi/js/CMakeLists.txt b/src/starkware/crypto/ffi/js/CMakeLists.txt index 5d23997..79b2e59 100644 --- a/src/starkware/crypto/ffi/js/CMakeLists.txt +++ b/src/starkware/crypto/ffi/js/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/libcrypto${CMAKE_SHARED_LIBRARY_SUFFIX} + OUTPUT libcrypto${CMAKE_SHARED_LIBRARY_SUFFIX} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/../libcrypto_c_exports${CMAKE_SHARED_LIBRARY_SUFFIX} @@ -8,7 +8,7 @@ add_custom_command( ) add_custom_target(js_test ALL - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libcrypto${CMAKE_SHARED_LIBRARY_SUFFIX} + DEPENDS libcrypto${CMAKE_SHARED_LIBRARY_SUFFIX} ) add_test(