Revert "DISPATCH-1942 Use findPython when on CMake3.15+"

This reverts commit f486435

Author: jiridanek

CMakeLists.txt

@@ -62,14 +62,8 @@ else (NOT APPLE)
   set(rt "")
 endif (NOT APPLE)
 
-# This setting mirrors FindPythonInterp behavior on Windows/macOS, which did not consult registry/frameworks first.
-if (NOT DEFINED Python_FIND_REGISTRY)
-    set(Python_FIND_REGISTRY "LAST")
-endif ()
-if (NOT DEFINED Python_FIND_FRAMEWORK)
-    set(Python_FIND_FRAMEWORK "LAST")
-endif ()
-find_package(Python REQUIRED COMPONENTS Interpreter Development)
+find_package(PythonInterp REQUIRED)
+find_package(PythonLibs REQUIRED)
 find_package(Threads REQUIRED)
 find_package(Proton 0.33.0 REQUIRED COMPONENTS Core Proactor)
 message(STATUS "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" )
@@ -108,29 +102,31 @@ if (LIBWEBSOCKETS_FOUND AND LIBWEBSOCKETS_VERSION_STRING)
 endif(LIBWEBSOCKETS_FOUND AND LIBWEBSOCKETS_VERSION_STRING)
 
 # Python
-if (Python_VERSION_MAJOR STREQUAL 3)
+if (PYTHON_VERSION_MAJOR STREQUAL 3)
     set(PY_STRING "python3")
-elseif(Python_VERSION_MAJOR STREQUAL 2)
+elseif(PYTHON_VERSION_MAJOR STREQUAL 2)
     set(PY_STRING "python")
 endif()
 
+enable_testing()
+
 # python unittest
 # For versions < 2.7 the developer needs to install the unittest2
 # module (available via 'yum install python-unittest2' or 'pip install unittest2'
 #
-if(Python_VERSION_MAJOR EQUAL 2 AND Python_VERSION_MINOR LESS 7)
+if(PYTHON_VERSION_MAJOR EQUAL 2 AND PYTHON_VERSION_MINOR LESS 7)
   set(PYTHON_TEST_COMMAND "unit2")
-  execute_process(COMMAND "${Python_EXECUTABLE}" "-c" "import unittest2"
+  execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" "import unittest2"
                   RESULT_VARIABLE UNITTEST_MISSING
                   ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
   if(UNITTEST_MISSING)
     message(WARNING "python-unittest2 is not installed. ***unit tests cannot be run***\ntry 'pip install python-unittest2' to install python-unittest2")
     # add bogus test for folk who may have missed the cmake warning
     add_test(WARNING_python_unittest2_module_NOT_INSTALLED false)
   endif(UNITTEST_MISSING)
-else(Python_VERSION_MAJOR EQUAL 2 AND Python_VERSION_MINOR LESS 7)
+else(PYTHON_VERSION_MAJOR EQUAL 2 AND PYTHON_VERSION_MINOR LESS 7)
   set(PYTHON_TEST_COMMAND "-m" "unittest")
-endif(Python_VERSION_MAJOR EQUAL 2 AND Python_VERSION_MINOR LESS 7)
+endif(PYTHON_VERSION_MAJOR EQUAL 2 AND PYTHON_VERSION_MINOR LESS 7)
 
 if(NOT UNITTEST_MISSING)
   if (NOT DEFINED DISPATCH_TEST_TIMEOUT)
@@ -166,7 +162,7 @@ set(CONSOLE_BASE_INSTALL_DIR "share/qpid-dispatch/console")
 set(CONSOLE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CONSOLE_BASE_INSTALL_DIR}")
 set(CONSOLE_STAND_ALONE_INSTALL_DIR "${CONSOLE_INSTALL_DIR}")
 
-set(RUN ${Python_EXECUTABLE} ${CMAKE_BINARY_DIR}/run.py)
+set(RUN ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/run.py)
 
 # define the configuration directory based on whether or not the install prefix is defined
 if(NOT DEFINED SYSCONF_INSTALL_DIR)
@@ -197,7 +193,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}/include
     ${Proton_Proactor_INCLUDE_DIRS}
     ${Proton_Core_INCLUDE_DIRS}
-    ${Python_INCLUDE_DIRS}
+    ${PYTHON_INCLUDE_PATH}
     )
 
 # Originally from the LLVM project, https://opensource.apple.com/source/llvmCore/llvmCore-2358.3/CMakeLists.txt.auto.html

cmake/FindPython.cmake

@@ -27,7 +27,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qpid_dispatch_site.py.in
                ${CMAKE_CURRENT_BINARY_DIR}/qpid_dispatch_site.py)
 
 # Install script for public python modules
-install(CODE "execute_process(COMMAND ${Python_EXECUTABLE} setup.py -v install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
+install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py -v install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
 
 install(FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/qpid_dispatch/management/qdrouter.json

python/CMakeLists.txt

@@ -20,7 +20,11 @@
 # Install script to install public python modules.
 # Install with setup.py, add installed files to install manifest.
 
+include(FindPythonInterp)
+
 set(PYTHON_MANIFEST ${CMAKE_BINARY_DIR}/python_manifest.txt)
 
+
+
 file(READ ${PYTHON_MANIFEST} PYTHON_MANIFEST_FILES)
 list(APPEND CMAKE_INSTALL_MANIFEST_FILES ${PYTHON_MANIFEST_FILES})

python/install_python.cmake

@@ -33,7 +33,7 @@ set(GENERATOR_DEPENDS ${GENERATOR_DEPENDS} ${GENERATOR_SRC})
 
 add_custom_command (
   OUTPUT ${GENERATED_SOURCES}
-  COMMAND ${Python_EXECUTABLE} ${CMAKE_BINARY_DIR}/tests/run.py -s ${CMAKE_CURRENT_SOURCE_DIR}/schema_c.py
+  COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/tests/run.py -s ${CMAKE_CURRENT_SOURCE_DIR}/schema_c.py
   DEPENDS ${GENERATOR_DEPENDS})
 
 # Build the qpid-dispatch library.
@@ -134,7 +134,7 @@ set(qpid_dispatch_LIBRARIES
   ${CMAKE_THREAD_LIBS_INIT}
   ${rt_lib}
   ${CMAKE_DL_LIBS}
-  ${Python_LIBRARIES}
+  ${PYTHON_LIBRARIES}
   )
 
 # USE_LIBWEBSOCKETS is true only if LIBWEBSOCKETS_FOUND

src/CMakeLists.txt

@@ -71,7 +71,7 @@ if(USE_BWRAP)
 else()
   set(BWRAP_ARGS "")
 endif()
-set(TEST_WRAP ${BWRAP_ARGS} ${Python_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/run.py)
+set(TEST_WRAP ${BWRAP_ARGS} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/run.py)
 
 add_test(unit_tests_size_10000 ${TEST_WRAP} unit_tests_size 10000)
 add_test(unit_tests_size_512   ${TEST_WRAP} unit_tests_size 512)