Cleanup search for Git and Python in CMake (#3185)

Author: stellar-aria

CMakeLists.txt

@@ -21,43 +21,9 @@ else()
     set(SEMVER_PRERELEASE_ID "-${RELEASE_TYPE}")
 endif()
 
-if(CMAKE_HOST_WIN32)
-  # Find python by ourselves, since on windows the find_package lookup
-  # seems to fail
-  set(Python_EXECUTABLE "$ENV{DBT_TOOLCHAIN_ROOT}/python/python.exe")
-  IF(EXISTS ${Python_EXECUTABLE})
-    execute_process(
-      COMMAND ${Python_EXECUTABLE} -c "import platform; print(platform.python_version())"
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-      OUTPUT_VARIABLE Python_VERSION
-      RESULT_VARIABLE Python_RESULT
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    if(NOT ${Python_RESULT} AND NOT ${Python_VERSION} STREQUAL "")
-      set(Python_Interpreter_FOUND 1)
-    else()
-      message(FATAL_ERROR "Python found at ${Python_EXECUTABLE} but failed to get version number")
-    endif()
-  else()
-    set(Python_Interpreter_FOUND 0)
-  endif()
-else()
-  find_package(Python COMPONENTS Interpreter)
-endif()
-
-if (Python_Interpreter_FOUND)
-    message(VERBOSE "python found: ${Python_EXECUTABLE} version ${Python_VERSION}")
-else()
-    message(FATAL_ERROR "Python not found")
-endif(Python_Interpreter_FOUND)
-
-find_package(Git)
-
-if(GIT_FOUND)
-    message(VERBOSE "git found: ${GIT_EXECUTABLE} version ${GIT_VERSION_STRING}")
-else()
-    message(FATAL_ERROR "Git not found. Check your path.")
-endif(GIT_FOUND)
+set(Python_ROOT $ENV{DBT_TOOLCHAIN_ROOT}/python CACHE STRING "Path to the Python installation")
+find_package(Python REQUIRED COMPONENTS Interpreter)
+find_package(Git REQUIRED)
 
 # Get the result of "git rev-parse --short HEAD"
 execute_process(
@@ -147,7 +113,6 @@ if(DOXYGEN_FOUND)
 
     # set(DOXYGEN_CLANG_ASSISTED_PARSING YES)
     # SET(DOXYGEN_CLANG_DATABASE_PATH build)
-
     set(DOXYGEN_USE_MDFILE_AS_MAINPAGE README.md)
 
     file(GLOB markdown_SOURCES *.md)
@@ -196,8 +161,6 @@ add_compile_options(
     # ASM stuff
     $<$<COMPILE_LANGUAGE:ASM>:-x>
     $<$<COMPILE_LANGUAGE:ASM>:assembler-with-cpp>
-
-
 )
 
 # Add libraries
@@ -229,6 +192,7 @@ list(APPEND DELUGE_COMMON_COMPILE_OPTIONS
     $<$<CONFIG:DEBUG>:-Wno-unused-parameter>
 
     $<$<CONFIG:DEBUG>:-Werror=write-strings>
+
     # Offsetof for non standard types is supported in GCC,
     # if another compiler does not support it they are obligated to error
 
@@ -269,7 +233,6 @@ target_link_options(deluge PUBLIC
 
     # Enabled to generate a full ELF, objcopy will do the stripping
     # $<$<CONFIG:RELEASE>:LINKER:--strip-all> # Strip
-
     -nostartfiles # Don't emit startfiles
 
     # Print details