From ece07a7192675ab0935e1935a9caca53b48b5264 Mon Sep 17 00:00:00 2001 From: Marek Wydmuch Date: Wed, 28 Aug 2019 00:44:14 +0200 Subject: [PATCH] Update cmake_all.bat --- cmake_all.bat | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake_all.bat b/cmake_all.bat index a74b374c6..dc37e6644 100755 --- a/cmake_all.bat +++ b/cmake_all.bat @@ -22,7 +22,7 @@ set BOOST_INCLUDEDIR=%BOOST_ROOT% set BOOST_LIBRARYDIR=%BOOST_ROOT%\libs :: Python -:: %%% Set Python version (27, 34, 35, 36, 37) or change paths for other distributions +:: %%% Set Python version (27, 35, 36, 37) or change paths for other distributions :: %%% Python for Windows can be downloaded from https://www.python.org/downloads/windows/ set PYTHON_LOCATION=C: set PYTHON_VERSION=37 @@ -32,8 +32,9 @@ set PYTHON_INCLUDE_DIR=%PYTHON_LOCATION%\Python%PYTHON_VERSION%\include set PYTHON_LIBRARY=%PYTHON_LOCATION%\Python%PYTHON_VERSION%\libs\python%PYTHON_VERSION%.lib set NUMPY_INCLUDES=%PYTHON_LOCATION%\Python%PYTHON_VERSION%\Lib\site-packages\numpy\core\include -:: %%% Install/upgrade numpy -%PYTHON_LOCATION%\Python%PYTHON_VERSION%\python.exe -m pip install numpy --upgrade +:: %%% Install/upgrade pip & numpy +%PYTHON_LOCATION%\Python%PYTHON_VERSION%\python.exe -m pip install --upgrade pip +%PYTHON_LOCATION%\Python%PYTHON_VERSION%\python.exe -m pip install --upgrade numpy :: TODO: Add default Anaconda paths :: TODO: Add Julia support