Index: openmolcas/CMakeLists.txt
===================================================================
--- openmolcas.orig/CMakeLists.txt
+++ openmolcas/CMakeLists.txt
@@ -48,7 +48,10 @@ find_program (GIT "git")
 find_program (PERL "perl")
 mark_as_advanced (FORCE GIT PERL)
 
-FIND_PACKAGE (Python COMPONENTS Interpreter)
+FIND_PACKAGE (PythonInterp 3.0)
+if (NOT PYTHONINTERP_FOUND)
+  FIND_PACKAGE (PythonInterp 2.7)
+endif ()
 
 ################################################################################
 #                                                                              #
@@ -2943,9 +2946,9 @@ add_custom_target (prgms ALL
 add_dependencies (mods_obj prgms)
 
 # generate help databases from doc
-if (Python_FOUND)
+if (PYTHONINTERP_FOUND)
   execute_process (
-    COMMAND ${Python_EXECUTABLE} ${OPENMOLCAS_DIR}/sbin/extract_xmldoc.py ${OPENMOLCAS_DIR}/doc ${PROJECT_BINARY_DIR}/data
+    COMMAND ${PYTHON_EXECUTABLE} ${OPENMOLCAS_DIR}/sbin/extract_xmldoc.py ${OPENMOLCAS_DIR}/doc ${PROJECT_BINARY_DIR}/data
     ERROR_VARIABLE EXTRACT_ERROR
     RESULT_VARIABLE EXTRACT_RESULT
   )
@@ -2966,7 +2969,7 @@ if (Python_FOUND)
     endif ()
   endif ()
 else ()
-  message (WARNING "No Python found, help databases will not be created.")
+  message (WARNING "No python found, help databases will not be created.")
 endif ()
 
 # generate rcodes.txt file
Index: openmolcas/Tools/dynamixtools/CMakeLists.txt
===================================================================
--- openmolcas.orig/Tools/dynamixtools/CMakeLists.txt
+++ openmolcas/Tools/dynamixtools/CMakeLists.txt
@@ -16,11 +16,11 @@ endif ()
 file (RELATIVE_PATH tooldir ${BASE_DIR} ${CMAKE_CURRENT_LIST_DIR})
 set (EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/${tooldir})
 
-if (Python_FOUND)
+if (PYTHONINTERP_FOUND)
 
   foreach (prog IN ITEMS dynamixtools)
     file (READ ${CMAKE_CURRENT_LIST_DIR}/${prog}.py content)
-    file (WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${prog}.py "#!/usr/bin/env ${Python_EXECUTABLE}\n")
+    file (WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${prog}.py "#!/usr/bin/env ${PYTHON_EXECUTABLE}\n")
     file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${prog}.py "${content}")
     file (COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${prog}.py
           DESTINATION ${EXECUTABLE_OUTPUT_PATH}
@@ -34,6 +34,6 @@ if (Python_FOUND)
 
 else ()
 
-  message (WARNING "No appropriate Python interpreter found, dynamixtools will be disabled")
+  message (WARNING "No appropriate python interpreter found, dynamixtools will be disabled")
 
 endif ()
Index: openmolcas/Tools/pymolcas/CMakeLists.txt
===================================================================
--- openmolcas.orig/Tools/pymolcas/CMakeLists.txt
+++ openmolcas/Tools/pymolcas/CMakeLists.txt
@@ -19,14 +19,14 @@ set (OUTPUT_PATH ${PROJECT_BINARY_DIR}/)
 file (GLOB py_sources "*.py")
 list (REMOVE_ITEM py_sources "${CMAKE_CURRENT_LIST_DIR}/pack.py")
 
-if (NOT Python_FOUND)
-  set (dir_error "disabled (no appropriate Python interpreter found)" PARENT_SCOPE)
+if (NOT PYTHONINTERP_FOUND)
+  set (dir_error "disabled (no appropriate python interpreter found)" PARENT_SCOPE)
   return ()
 endif ()
 
-set (Python_FOUND "${Python_FOUND}" PARENT_SCOPE)
+set (PYTHONINTERP_FOUND "${PYTHONINTERP_FOUND}" PARENT_SCOPE)
 
-execute_process (COMMAND ${Python_EXECUTABLE} imports.py
+execute_process (COMMAND ${PYTHON_EXECUTABLE} imports.py
                  WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
                  OUTPUT_VARIABLE PYMOLCAS_IMPORT_OUTPUT
                  RESULT_VARIABLE PYMOLCAS_IMPORT_RC
@@ -34,7 +34,7 @@ execute_process (COMMAND ${Python_EXECUT
 )
 
 if (PYMOLCAS_IMPORT_RC)
-  message (WARNING "Some Python modules are not available: ${PYMOLCAS_IMPORT_OUTPUT}")
+  message (WARNING "Some python modules are not available: ${PYMOLCAS_IMPORT_OUTPUT}")
   set (dir_error "disabled" PARENT_SCOPE)
   return ()
 endif ()
@@ -44,7 +44,7 @@ set (PYMOLCAS_SCRIPT "${PYMOLCAS_SCRIPT}
 
 # Note the command and the target must have different names
 add_custom_command (OUTPUT ${PYMOLCAS_SCRIPT}
-                    COMMAND ${Python_EXECUTABLE} export.py ${PYMOLCAS_SCRIPT}
+                    COMMAND ${PYTHON_EXECUTABLE} export.py ${PYMOLCAS_SCRIPT}
                     WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
                     DEPENDS ${py_sources}
 )