cmake: call fypp with the CMake-found Python interpreter

CMakeLists.txt

@@ -139,7 +139,7 @@ find_package(LAPACK REQUIRED) # needed for some of the integrated test routines,
                               # also calls find_package(BLAS)
 
 # =================================== Python this module looks preferably for
-# version 3 of Python. If not found, version 2 is searched In CMake 3.15, if a
+# version 3 of Python. If not found, version 2 is searched. In CMake 3.15, if a
 # python virtual environment is activated, it will search the virtual
 # environment for a python interpreter before searching elsewhere in the system.
 # In CMake <3.15, the system is searched before the virtual environment.

cmake/CheckCompilerSupport.cmake

@@ -1,11 +1,7 @@
 include(CheckFortranSourceCompiles)
 
 set(CHECK_PROGRAMS f2008-norm2.f90 f2008-block_construct.f90
-                   f2008-contiguous.f90)
-
-if (CMAKE_Fortran_COMPILER_ID STREQUAL "PGI")
-  set(CHECK_PROGRAMS ${CHECK_PROGRAMS} f95-reshape-order-allocatable.f90)
-endif ()
+                   f2008-contiguous.f90 f95-reshape-order-allocatable.f90)
 
 foreach (prog ${CHECK_PROGRAMS})
   get_filename_component(prog_ext ${prog} EXT) # get the src extension to pass

cmake/fypp-sources.cmake

@@ -56,7 +56,8 @@ function (ADD_FYPP_SOURCES OUTVAR)
       # now add the custom command to generate the output file
       add_custom_command(
         OUTPUT "${of}"
-        COMMAND ${FYPP_EXECUTABLE} ARGS ${fypp_flags} "${f}" "${of}"
+        COMMAND ${Python_EXECUTABLE} ${FYPP_EXECUTABLE} ARGS ${fypp_flags}
+                "${f}" "${of}"
         MAIN_DEPENDENCY "${f}"
         VERBATIM)
     elseif ("${f}" MATCHES ".h$")
@@ -65,7 +66,7 @@ function (ADD_FYPP_SOURCES OUTVAR)
       # now add the custom command to generate the output file
       add_custom_command(
         OUTPUT "${of}"
-        COMMAND ${FYPP_EXECUTABLE} ARGS "-F" "${f}" "${of}"
+        COMMAND ${Python_EXECUTABLE} ${FYPP_EXECUTABLE} ARGS "-F" "${f}" "${of}"
         DEPENDS "${f}")
     else ()
       configure_file("${f}" "${of}" COPYONLY)