thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-28 18:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix find_package(Rust) for corrosion-cmake

Browse Source
This commit is contained in:
BoloniniD 2022-09-20 22:10:57 +03:00
parent 55fcb98f29
commit 7642212ff8
9 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/capnproto vendored

@ -1 +1 @@
Subproject commit 2e88221d3dde22266bfccf40eaee6ff9b40d113d Subproject commit c8189ec3c27dacbd4a3288e682473010e377f593

15
contrib/corrosion-cmake/CMakeLists.txt
View File

@ -1,11 +1,17 @@
if (NOT ENABLE_LIBRARIES) if (NOT ENABLE_LIBRARIES)
option(ENABLE_RUST "Enable rust" FALSE) option(ENABLE_RUST "Enable rust" FALSE)
elseif((CMAKE_TOOLCHAIN_FILE MATCHES "darwin") AND (CMAKE_TOOLCHAIN_FILE MATCHES "aarch64"))
option(ENABLE_RUST FALSE)
message(STATUS "Rust is not available on aarch64-apple-darwin")
return()
else() else()
list (APPEND CMAKE_MODULE_PATH "${ClickHouse_SOURCE_DIR}/contrib/corrosion/cmake") list (APPEND CMAKE_MODULE_PATH "${ClickHouse_SOURCE_DIR}/contrib/corrosion/cmake")
find_package(Rust) find_package(Rust)
option(ENABLE_RUST "Enable rust" $Rust_FOUND) option(ENABLE_RUST "Enable rust" ${Rust_FOUND})
endif() endif()
message(STATUS ${ENABLE_RUST})
if(NOT ENABLE_RUST) if(NOT ENABLE_RUST)
message(STATUS "Not using rust") message(STATUS "Not using rust")
return() return()
@ -21,13 +27,6 @@ if(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-aarch64")
set(Rust_CARGO_TARGET "aarch64-unknown-linux-gnu") set(Rust_CARGO_TARGET "aarch64-unknown-linux-gnu")
endif() endif()
if((CMAKE_TOOLCHAIN_FILE MATCHES "darwin") AND (CMAKE_TOOLCHAIN_FILE MATCHES "aarch64"))
set(Rust_CARGO_TARGET "aarch64-apple-darwin")
message(STATUS "Rust is not available on aarch64-apple-darwin")
set(ENABLE_RUST FALSE)
return()
endif()
if((CMAKE_TOOLCHAIN_FILE MATCHES "darwin") AND (CMAKE_TOOLCHAIN_FILE MATCHES "x86_64")) if((CMAKE_TOOLCHAIN_FILE MATCHES "darwin") AND (CMAKE_TOOLCHAIN_FILE MATCHES "x86_64"))
set(Rust_CARGO_TARGET "x86_64-apple-darwin") set(Rust_CARGO_TARGET "x86_64-apple-darwin")
endif() endif()

2
contrib/krb5 vendored

@ -1 +1 @@
Subproject commit b89e20367b074bd02dd118a6534099b21e88b3c3 Subproject commit d879821c7a4c70b0c3ad739d9951d1a2b1903df7

2
contrib/libcpuid vendored

@ -1 +1 @@
Subproject commit 503083acb77edf9fbce22a05826307dff2ce96e6 Subproject commit 8db3b8d2d32d22437f063ce692a1b9bb15e42d18

2
contrib/librdkafka vendored

@ -1 +1 @@
Subproject commit 6f3b483426a8c8ec950e27e446bec175cf8b553f Subproject commit ff32b4e9eeafd0b276f010ee969179e4e9e6d0b2

2
contrib/llvm vendored

@ -1 +1 @@
Subproject commit 0db5bf5bd2452cd8f1283a1fcdc04845af705bfc Subproject commit 20607e61728e97c969e536644c3c0c1bb1a50672

2
contrib/replxx vendored

@ -1 +1 @@
Subproject commit 5d04501f93a4fb7f0bb8b73b8f614bc986f9e25b Subproject commit 3fd0e3c9364a589447453d9906d854ebd8d385c5

2
contrib/sentry-native vendored

@ -1 +1 @@
Subproject commit ae10fb8c224c3f41571446e1ed7fd57b9e5e366b Subproject commit f431047ac8da13179c488018dddf1c0d0771a997

2
contrib/vectorscan vendored

@ -1 +1 @@
Subproject commit f6250ae3e5a3085000239313ad0689cc1e00cdc2 Subproject commit 73695e419c27af7fe2a099c7aa57931cc02aea5d