Merge e952c06 into 732f35f

OpenCMISS · May 2, 2018 · 3062626 · 3062626
2 parents 732f35f + e952c06
commit 3062626
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
@@ -26,7 +26,7 @@ if (WITH_C_BINDINGS)
     set(OPENCMISS_C_F90 "${CMAKE_CURRENT_BINARY_DIR}/iron_c.f90")
     add_custom_command(OUTPUT ${OPENCMISS_C_F90} ${OPENCMISS_H}
         DEPENDS ${Iron_SOURCE_DIR}/src/opencmiss_iron.f90 # Need to re-build if that file changes!
-        COMMAND "${PYTHON_EXECUTABLE}" generate_bindings "${Iron_SOURCE_DIR}" C "${OPENCMISS_H}" "${OPENCMISS_C_F90}"
+        COMMAND "${Python_EXECUTABLE}" generate_bindings "${Iron_SOURCE_DIR}" C "${OPENCMISS_H}" "${OPENCMISS_C_F90}"
         WORKING_DIRECTORY ${Iron_SOURCE_DIR}/bindings
     )
     list(APPEND _CLEANUP ${OPENCMISS_H} ${OPENCMISS_C_F90})
@@ -77,7 +77,7 @@ if (WITH_Python_BINDINGS)
     if (NOT SWIG_FOUND)
         message(FATAL_ERROR "SWIG could not be found. Unable to generate Python bindings for Iron.")
     endif()
-    execute_process(COMMAND "${PYTHON_EXECUTABLE}" "${Iron_SOURCE_DIR}/utils/numpy_include.py"
+    execute_process(COMMAND "${Python_EXECUTABLE}" "${Iron_SOURCE_DIR}/utils/numpy_include.py"
         OUTPUT_VARIABLE NUMPY_INCLUDES
         RESULT_VARIABLE RES_NUMPY_INC
         OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -101,7 +101,7 @@ if (WITH_Python_BINDINGS)
     set(SWIG_IFACE "${CMAKE_CURRENT_BINARY_DIR}/iron_generated.i")
     add_custom_command(OUTPUT ${SWIG_IFACE}
         DEPENDS ${Iron_SOURCE_DIR}/src/opencmiss_iron.f90 # Need to re-build if that file changes!
-        COMMAND "${PYTHON_EXECUTABLE}" generate_bindings "${Iron_SOURCE_DIR}" SWIG "${SWIG_IFACE}"
+        COMMAND "${Python_EXECUTABLE}" generate_bindings "${Iron_SOURCE_DIR}" SWIG "${SWIG_IFACE}"
         COMMENT "Generating swig interface file for Iron"
         WORKING_DIRECTORY ${Iron_SOURCE_DIR}/bindings
     )
@@ -196,7 +196,7 @@ if (WITH_Python_BINDINGS)
     set(IRON_PY ${CMAKE_CURRENT_BINARY_DIR}/iron.py) # see python.py script in generate_bindings for iron.py name
     add_custom_command(OUTPUT ${IRON_PY}
         DEPENDS ${Iron_SOURCE_DIR}/src/opencmiss_iron.f90 # Need to re-build if that file changes!
-        COMMAND "${PYTHON_EXECUTABLE}" generate_bindings 
+        COMMAND "${Python_EXECUTABLE}" generate_bindings 
             "${Iron_SOURCE_DIR}" Python ${IRON_PYTHON_MODULE} "${CMAKE_CURRENT_BINARY_DIR}"
         COMMENT "Generating Python binding script"
         WORKING_DIRECTORY "${Iron_SOURCE_DIR}/bindings"

diff --git a/bindings/python/tests/CMakeLists.txt b/bindings/python/tests/CMakeLists.txt
@@ -4,39 +4,39 @@ file(TO_NATIVE_PATH "${BINDINGS_BIN_DIR}/$<CONFIG>" NATIVE_PYTHON_BINDINGS_DIR)
 # Add the tests
 set(PYTHONTESTS )
 add_test(NAME Python_Bindings_Import
-    COMMAND ${PYTHON_EXECUTABLE} -c "from opencmiss.iron import iron"
+    COMMAND ${Python_EXECUTABLE} -c "from opencmiss.iron import iron"
 )
 list(APPEND PYTHONTESTS Python_Bindings_Import)
 
 add_test(NAME Python_Bindings_Cantilever
-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Cantilever.py
+    COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Cantilever.py
 )
 list(APPEND PYTHONTESTS Python_Bindings_Cantilever)
 
 
 add_test(NAME Python_Bindings_CellMLModelIntegration_n98_Euler
-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/CellMLModelIntegration.py ${Iron_SOURCE_DIR}/tests/CellML/n98.xml euler 0.01
+    COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/CellMLModelIntegration.py ${Iron_SOURCE_DIR}/tests/CellML/n98.xml euler 0.01
 )
 list(APPEND PYTHONTESTS Python_Bindings_CellMLModelIntegration_n98_Euler)
 
 add_test(NAME Python_Bindings_CellMLModelIntegration_n98_BDF
-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/CellMLModelIntegration.py ${Iron_SOURCE_DIR}/tests/CellML/n98.xml bdf 0.01
+    COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/CellMLModelIntegration.py ${Iron_SOURCE_DIR}/tests/CellML/n98.xml bdf 0.01
 )
 list(APPEND PYTHONTESTS Python_Bindings_CellMLModelIntegration_n98_BDF)
 
 add_test(NAME Python_Bindings_CellMLModelIntegration_n98_Euler_0.005
-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/CellMLModelIntegration.py ${Iron_SOURCE_DIR}/tests/CellML/n98.xml euler 0.005
+    COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/CellMLModelIntegration.py ${Iron_SOURCE_DIR}/tests/CellML/n98.xml euler 0.005
 )
 list(APPEND PYTHONTESTS Python_Bindings_CellMLModelIntegration_n98_Euler_0.005)
 
 add_test(NAME Python_Bindings_Laplace
-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Laplace.py
+    COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Laplace.py
 )
 list(APPEND PYTHONTESTS Python_Bindings_Laplace)
 
 # Does not seem to converge! Needs checking
 #add_test(NAME Python_Bindings_Monodomain2DSquare
-#    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Monodomain2DSquare.py ${Iron_SOURCE_DIR}/tests/CellML/n98.xml
+#    COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Monodomain2DSquare.py ${Iron_SOURCE_DIR}/tests/CellML/n98.xml
 #)
 #list(APPEND PYTHONTESTS Python_Bindings_Monodomain2DSquare)