From b3de2ee5d75d13d31ad9588ddf804ea1a06b469d Mon Sep 17 00:00:00 2001 From: Jonathan Simms Date: Tue, 10 Jul 2018 16:23:24 -0400 Subject: [PATCH] add HAVE_RUST option defaulted to off (#158) Don't install rust in CI until we land stuff that depends on it --- CMakeLists.txt | 8 +++++--- ci/before-install.sh | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e46135376..47adbe801 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,7 @@ option(HAVE_ASSERT_PANIC "assert_panic disabled by default" OFF) option(HAVE_LOGGING "logging enabled by default" ON) option(HAVE_STATS "stats enabled by default" ON) option(HAVE_DEBUG_MM "debugging oriented memory management disabled by default" OFF) +option(HAVE_RUST "build rust components" OFF) option(COVERAGE "code coverage" OFF) if(BUILD_AND_INSTALL_CHECK) @@ -143,9 +144,10 @@ endif(CHECK_FOUND) find_package(Threads) -enable_language(Rust) -include(CMakeCargo) - +if(HAVE_RUST) + enable_language(Rust) + include(CMakeCargo) +endif() # where to find include files include_directories(${include_directories} diff --git a/ci/before-install.sh b/ci/before-install.sh index d948672db..0af64ac52 100755 --- a/ci/before-install.sh +++ b/ci/before-install.sh @@ -26,4 +26,4 @@ fi export CC="$C_COMPILER" -curl https://sh.rustup.rs -sSf | sh -s -- -y +# curl https://sh.rustup.rs -sSf | sh -s -- -y