Merge pull request #19 from GEOS-ESM/feature/mathomp4/use-py2-py3-sam…

…e-time

Updates to use Python2 and Python3 at same time

UMD_utils/CMakeLists.txt

@@ -26,14 +26,17 @@ foreach (file ocean_recenter anaice2rst ocean_moments ocean_iau)
       )
 endforeach ()
 
-if (F2PY_FOUND)
-   add_f2py_module(read_merra2_bcs
-      SOURCES read_bin.f90
-      DESTINATION bin
-      INCLUDEDIRS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR}/lib ${include_${this}}
-      )
-   add_dependencies(read_merra2_bcs ${this})
-endif (F2PY_FOUND)
+if (USE_F2PY)
+   find_package(F2PY2)
+   if (F2PY2_FOUND)
+      esma_add_f2py2_module(read_merra2_bcs
+         SOURCES read_bin.f90
+         DESTINATION bin
+         INCLUDEDIRS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR}/lib ${include_${this}}
+         )
+      add_dependencies(read_merra2_bcs ${this})
+   endif ()
+endif ()
 
 file (GLOB python_files CONFIGURE_DEPENDS *.py)
 install(