From b746264509ba1959ceab7a1929f374a6fdad2ce6 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Mon, 22 May 2017 17:30:00 -0500 Subject: [PATCH] spit numpy status --- appveyor.yml | 1 + cmake/modules/FindNumPy.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index bc838e52fc..b7d41ff3cc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -50,6 +50,7 @@ install: - call %OSGEO4W_ROOT%\bin\py3_env.bat # install numpy this way - c:\OSGeo4W64\apps\Python36\python.exe -m pip install numpy + - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH% - set PATH=%PATH%;C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\7-Zip;C:\Program Files\Microsoft Windows Performance Toolkit\;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Tools\GitVersion;C:\Program Files (x86)\CMake\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\AppVeyor\BuildAgent\ - echo %PATH% diff --git a/cmake/modules/FindNumPy.cmake b/cmake/modules/FindNumPy.cmake index b663ba8795..0ad4be7e41 100644 --- a/cmake/modules/FindNumPy.cmake +++ b/cmake/modules/FindNumPy.cmake @@ -20,7 +20,7 @@ FIND_PACKAGE(PythonLibs QUIET REQUIRED) EXECUTE_PROCESS(COMMAND "${PYTHON_EXECUTABLE}" -c "import numpy; print (numpy.get_include()); print (numpy.version.version)" OUTPUT_VARIABLE NUMPY_OUTPUT ERROR_VARIABLE NUMPY_ERROR) - +message(STATUS "Numpy output: ${NUMPY_OUTPUT}") IF(NOT NUMPY_ERROR) STRING(REPLACE "\n" ";" NUMPY_OUTPUT ${NUMPY_OUTPUT}) LIST(GET NUMPY_OUTPUT 0 NUMPY_INCLUDE_DIR)