From 8fc344beeeddc2d7957a0e9aebfdd3aff603aeec Mon Sep 17 00:00:00 2001 From: Vicente Eduardo Ferrer Garcia Date: Wed, 24 Jan 2024 18:39:26 +0100 Subject: [PATCH] Change FindPython3.cmake. --- .github/workflows/release.yml | 3 --- .github/workflows/test.yml | 3 --- build.bat | 18 +++++++++--------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d5ca758..c047863 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,9 +13,6 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 with: arch: amd64 - - name: Delete Python - shell: powershell - run: Remove-Item -Recurse -Force -Path "C:/hostedtoolcache/windows/Python" - name: Build shell: powershell run: .\build.bat diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 64aa075..407883d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,9 +13,6 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 with: arch: amd64 - - name: Delete Python - shell: powershell - run: Remove-Item -Recurse -Force -Path "C:/hostedtoolcache/windows/Python" - name: Build shell: powershell run: .\build.bat diff --git a/build.bat b/build.bat index 80c72bc..84675a0 100644 --- a/build.bat +++ b/build.bat @@ -113,15 +113,15 @@ echo include(FindPackageHandleStandardArgs)>> "%loc%\core\cmake\FindRuby.cmake" echo FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ruby REQUIRED_VARS Ruby_EXECUTABLE Ruby_LIBRARY Ruby_INCLUDE_DIRS VERSION_VAR Ruby_VERSION)>> "%loc%\core\cmake\FindRuby.cmake" echo mark_as_advanced(Ruby_EXECUTABLE Ruby_LIBRARY Ruby_INCLUDE_DIRS)>> "%loc%\core\cmake\FindRuby.cmake" -rem Patch for FindPython.cmake -echo set(Python3_VERSION 3.9.7)> "%loc%\core\cmake\FindPython.cmake" -echo set(Python3_ROOT_DIR "%escaped_loc%/runtimes/python")>> "%loc%\core\cmake\FindPython.cmake" -echo set(Python3_EXECUTABLE "%escaped_loc%/runtimes/python/python.exe")>> "%loc%\core\cmake\FindPython.cmake" -echo set(Python3_INCLUDE_DIRS "%escaped_loc%/runtimes/python/include")>> "%loc%\core\cmake\FindPython.cmake" -echo set(Python3_LIBRARIES "%escaped_loc%/runtimes/python/libs/python39.lib")>> "%loc%\core\cmake\FindPython.cmake" -echo include(FindPackageHandleStandardArgs)>> "%loc%\core\cmake\FindPython.cmake" -echo FIND_PACKAGE_HANDLE_STANDARD_ARGS(Python REQUIRED_VARS Python_EXECUTABLE Python_LIBRARIES Python_INCLUDE_DIRS VERSION_VAR Python_VERSION)>> "%loc%\core\cmake\FindPython.cmake" -echo mark_as_advanced(Python_EXECUTABLE Python_LIBRARIES Python_INCLUDE_DIRS)>> "%loc%\core\cmake\FindPython.cmake" +rem Patch for FindPython3.cmake +echo set(Python3_VERSION 3.9.7)> "%loc%\core\cmake\FindPython3.cmake" +echo set(Python3_ROOT_DIR "%escaped_loc%/runtimes/python")>> "%loc%\core\cmake\FindPython3.cmake" +echo set(Python3_EXECUTABLE "%escaped_loc%/runtimes/python/python.exe")>> "%loc%\core\cmake\FindPython3.cmake" +echo set(Python3_INCLUDE_DIRS "%escaped_loc%/runtimes/python/include")>> "%loc%\core\cmake\FindPython3.cmake" +echo set(Python3_LIBRARIES "%escaped_loc%/runtimes/python/libs/python39.lib")>> "%loc%\core\cmake\FindPython3.cmake" +echo include(FindPackageHandleStandardArgs)>> "%loc%\core\cmake\FindPython3.cmake" +echo FIND_PACKAGE_HANDLE_STANDARD_ARGS(Python REQUIRED_VARS Python_EXECUTABLE Python_LIBRARIES Python_INCLUDE_DIRS VERSION_VAR Python_VERSION)>> "%loc%\core\cmake\FindPython3.cmake" +echo mark_as_advanced(Python_EXECUTABLE Python_LIBRARIES Python_INCLUDE_DIRS)>> "%loc%\core\cmake\FindPython3.cmake" rem Patch for FindCoreCLR.cmake echo set(CoreCLR_VERSION 5.0.12)> "%loc%\core\cmake\FindCoreCLR.cmake"