Skip to content

Commit

Permalink
add HAVE_RUST option defaulted to off (twitter#158)
Browse files Browse the repository at this point in the history
Don't install rust in CI until we land stuff that depends on it
  • Loading branch information
slyphon authored Jul 10, 2018
1 parent ffc70a8 commit b3de2ee
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion ci/before-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit b3de2ee

Please sign in to comment.