Skip to content
This repository has been archived by the owner on Sep 5, 2022. It is now read-only.

Commit

Permalink
Merge pull request #10 from Darrell666/patch-1
Browse files Browse the repository at this point in the history
Fixed references to SciPy and removed extra leading "h" on http
  • Loading branch information
awhiemstra authored Apr 18, 2017
2 parents 779f99e + f76d4df commit 7fc1a41
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions projects/numpy.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ else()
# This means we need to use a pre-compiled binary version of Scipy. Since the only version of SciPy for
# Windows available depends on numpy with MKL, we also need the binary package for that.
if( BUILD_OS_WIN32 )
add_custom_target(SciPy
COMMAND ${PYTHON_EXECUTABLE} -m pip install hhttp://software.ultimaker.com/cura-binary-dependencies/numpy-1.11.3+mkl-cp35-cp35m-win32.whl
COMMENT "Installing SciPy"
add_custom_target(NumPy
COMMAND ${PYTHON_EXECUTABLE} -m pip install http://software.ultimaker.com/cura-binary-dependencies/numpy-1.11.3+mkl-cp35-cp35m-win32.whl
COMMENT "Installing NumPy"
)
SetProjectDependencies(TARGET PyQt DEPENDS Python)
else()
add_custom_target(SciPy
add_custom_target(NumPy
COMMAND ${PYTHON_EXECUTABLE} -m pip install http://software.ultimaker.com/cura-binary-dependencies/numpy-1.11.3+mkl-cp35-cp35m-win_amd64.whl
COMMENT "Installing SciPy"
COMMENT "Installing NumPy"
)
endif()
endif()
Expand Down

0 comments on commit 7fc1a41

Please sign in to comment.