Update ConanHandle.cmake

traversebitree · Feb 2, 2024 · 963f60a · 963f60a
1 parent bc95aba
commit 963f60a
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/cmake/ConanHandle.cmake b/cmake/ConanHandle.cmake
@@ -1,24 +1,13 @@
 include_guard(GLOBAL)
 set(ENV{CONAN_HOME} "${CMAKE_CURRENT_SOURCE_DIR}/.conan")
 set(_CONAN_BUILD_ROOT_PATH "$ENV{CONAN_HOME}/build")
-find_package(Python3 COMPONENTS Interpreter REQUIRED)
-cmake_path(GET Python3_EXECUTABLE PARENT_PATH _PYTHON_ROOT)
-set(_PYTHON_SCRIPT_ROOT_PATH "${_PYTHON_ROOT}/Scripts")
-if(NOT EXISTS "${_PYTHON_SCRIPT_ROOT_PATH}")
-  file(DOWNLOAD https://bootstrap.pypa.io/get-pip.py "${_PYTHON_ROOT}/get-pip.py")
-  execute_process(
-    COMMAND ${_PYTHON_EXEC} "get-pip.py" "--no-warn-script-location" WORKING_DIRECTORY ${_PYTHON_ROOT}
-                                                                                       COMMAND_ERROR_IS_FATAL LAST
-  )
-endif()
-find_program(_PIP_EXEC "pip" HINTS "${_PYTHON_SCRIPT_ROOT_PATH}" NO_DEFAULT_PATH REQUIRED)
-find_program(_CONAN_EXEC "conan" HINTS "${_PYTHON_SCRIPT_ROOT_PATH}" NO_DEFAULT_PATH)
-
+find_program(_CONAN_EXEC "conan")
 if(NOT EXISTS "${_CONAN_EXEC}")
-  message(STATUS "CONAN_EXEC: ${_CONAN_EXEC}")
-  execute_process(COMMAND ${_PIP_EXEC} "install" "conan" COMMAND_ERROR_IS_FATAL LAST)
-  find_program(_CONAN_EXEC "conan" HINTS "${_PYTHON_SCRIPT_ROOT_PATH}" NO_DEFAULT_PATH REQUIRED)
+  find_package(Python3 COMPONENTS Interpreter REQUIRED)
+  execute_process(COMMAND ${Python3_EXECUTABLE} "-m" "pip" "install" "conan" COMMAND_ERROR_IS_FATAL LAST)
+  find_program(_CONAN_EXEC "conan" REQUIRED)
 endif()
+
 set(_CONAN_PROFILE_FILE_PATH "$ENV{CONAN_HOME}/profiles/default")
 if(NOT EXISTS "${_CONAN_PROFILE_FILE_PATH}")
   execute_process(COMMAND ${_CONAN_EXEC} "profile" "detect" COMMAND_ERROR_IS_FATAL LAST)