8000 Add CMake hints by dsame · Pull Request #440 · actions/setup-python · GitHub
[go: up one dir, main page]
Skip to content

Add CMake hints #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 30, 2022
Merged

Add CMake hints #440

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69b9446
Add CMake hints
dsame Jun 28, 2022
63086c6
rebase main
dsame Jun 30, 2022
e629242
Fix failed check
dsame Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rebase main
  • Loading branch information
@dsame
dsame committed Jun 30, 2022
commit 63086c6dedb585bdcbe92068dcf2e8229aadda5d
22 changes: 6 additions & 16 deletions dist/setup/index.js
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -63884,25 +63884,18 @@ function findPyPyVersion(versionSpec, architecture, updateEnvironment) {
const binaryExtension = utils_1.IS_WINDOWS ? '.exe' : '';
const pythonPath = path.join(utils_1.IS_WINDOWS ? installDir : _binDir, `python${binaryExtension}`);
const pythonLocation = pypyInstall.getPyPyBinaryPath(installDir);
<<<<<<< HEAD
if (updateEnvironment) {
core.exportVariable('pythonLocation', installDir);
// https://cmake.org/cmake/help/latest/module/FindPython.html#module:FindPython
core.exportVariable('Python_ROOT_DIR', installDir);
// https://cmake.org/cmake/help/latest/module/FindPython2.html#module:FindPython2
core.exportVariable('Python2_ROOT_DIR', installDir);
// https://cmake.org/cmake/help/latest/module/FindPython3.html#module:FindPython3
core.exportVariable('Python3_ROOT_DIR', installDir);
core.exportVariable('PKG_CONFIG_PATH', pythonLocation + '/lib/pkgconfig');
core.addPath(pythonLocation);
core.addPath(_binDir);
}
=======
core.exportVariable('pythonLocation', installDir);
// https://cmake.org/cmake/help/latest/module/FindPython.html#module:FindPython
core.exportVariable('Python_ROOT_DIR', installDir);
// https://cmake.org/cmake/help/latest/module/FindPython2.html#module:FindPython2
core.exportVariable('Python2_ROOT_DIR', installDir);
// https://cmake.org/cmake/help/latest/module/FindPython3.html#module:FindPython3
core.exportVariable('Python3_ROOT_DIR', installDir);
core.exportVariable('PKG_CONFIG_PATH', pythonLocation + '/lib/pkgconfig');
core.addPath(pythonLocation);
core.addPath(_binDir);
>>>>>>> 31fd3d4 (Add CMake hints)
core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
core.setOutput('python-path', pythonPath);
return { resolvedPyPyVersion, resolvedPythonVersion };
Expand Down Expand Up @@ -64055,8 +64048,6 @@ function useCpythonVersion(version, architecture, updateEnvironment) {
`The list of all available versions can be found here: ${installer.MANIFEST_URL}`
].join(os.EOL));
}
<<<<<<< HEAD
=======
core.exportVariable('pythonLocation', installDir);
// https://cmake.org/cmake/help/latest/module/FindPython.html#module:FindPython
core.exportVariable('Python_ROOT_DIR', installDir);
Expand All @@ -64074,7 +64065,6 @@ function useCpythonVersion(version, architecture, updateEnvironment) {
core.exportVariable('LD_LIBRARY_PATH', pyLibPath + libPath);
}
}
>>>>>>> 31fd3d4 (Add CMake hints)
const _binDir = binDir(installDir);
const binaryExtension = utils_1.IS_WINDOWS ? '.exe' : '';
const pythonPath = path.join(utils_1.IS_WINDOWS ? installDir : _binDir, `python${binaryExtension}`);
Expand Down
0