From 4489d15994d2ab9ab2448afd937ba13c65a9907d Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Sat, 15 Apr 2017 15:01:48 +0530
Subject: [PATCH] Squashed 'moose-core/' changes from 669b981..270c880
270c880 Search numpy path in cmake are fixed for snapcraft.
git-subtree-dir: moose-core
git-subtree-split: 270c880c3a3005c3ed1000a87069a0f6bb1bdb0f
---
VERSION | 2 +-
cmake_modules/FindNumPy.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/VERSION b/VERSION
index 90dd2fed..93738075 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.1-100-g51a3a30
+3.1.1-129-g669b981
\ No newline at end of file
diff --git a/cmake_modules/FindNumPy.cmake b/cmake_modules/FindNumPy.cmake
index b2813e9c..83c74d47 100644
--- a/cmake_modules/FindNumPy.cmake
+++ b/cmake_modules/FindNumPy.cmake
@@ -52,7 +52,7 @@ if(NOT PYTHONINTERP_FOUND)
return()
endif()
-execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c"
+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
"import numpy as n; print(n.__version__); print(n.get_include());"
RESULT_VARIABLE _NUMPY_SEARCH_SUCCESS
OUTPUT_VARIABLE _NUMPY_VALUES_OUTPUT
--
GitLab