Skip to content
Permalink
Browse files

Remove attempts to set FORCE_BUILD_JULIA_BINDINGS.

  • Loading branch information
rcurtin committed Dec 8, 2019
1 parent c05dc9f commit c1ba28d732499ab249b49aa32ddda73ddb177127
Showing with 2 additions and 14 deletions.
  1. +1 −9 CMakeLists.txt
  2. +1 −5 src/mlpack/bindings/julia/CMakeLists.txt
@@ -17,6 +17,7 @@ option(DISABLE_DOWNLOADS "Disable downloads of dependencies during build." OFF)
option(DOWNLOAD_ENSMALLEN "If ensmallen is not found, download it." ON)
option(DOWNLOAD_STB_IMAGE "Download stb_image for image loading." ON)
option(BUILD_PYTHON_BINDINGS "Build Python bindings." ON)
option(BUILD_JULIA_BINDINGS "Build Julia bindings." ON)

if (WIN32)
option(BUILD_SHARED_LIBS
@@ -29,15 +30,6 @@ else ()
"Compile shared libraries (if OFF, static libraries are compiled)." ON)
endif()

# Detect whether the user passed BUILD_JULIA_BINDINGS in order to determine if
# we should fail if Julia isn't found.
if (BUILD_JULIA_BINDINGS AND NOT DEFINED FORCE_BUILD_JULIA_BINDINGS)
set(FORCE_BUILD_JULIA_BINDINGS ON CACHE BOOL "Force building Julia bindings.")
else()
set(FORCE_BUILD_JULIA_BINDINGS OFF CACHE BOOL "Force building Julia binidngs.")
endif()
option(BUILD_JULIA_BINDINGS "Build Julia bindings." ON)

# Build Markdown bindings for documentation. This is used as part of website
# generation.
option(BUILD_MARKDOWN_BINDINGS "Build Markdown bindings for website documentation." OFF)
@@ -2,11 +2,7 @@ if (BUILD_JULIA_BINDINGS)
## We need to check here if Julia is even available. Although actually
## technically, I'm not sure if we even need to know! For the tests though we
## do. So it's probably a good idea to check.
if (FORCE_BUILD_JULIA_BINDINGS)
find_package(Julia 0.7.0 REQUIRED)
else ()
find_package(Julia 0.7.0)
endif ()
find_package(Julia 0.7.0)

if (NOT JULIA_FOUND)
# We can't build anything, so define the macro to do nothing.

0 comments on commit c1ba28d

Please sign in to comment.
You can’t perform that action at this time.