@@ -64048,14 +64048,6 @@ function useCpythonVersion(version, architecture, updateEnvironment) {
64048
64048
`The list of all available versions can be found here: ${installer.MANIFEST_URL}`
64049
64049
].join(os.EOL));
64050
64050
}
64051
- core.exportVariable('pythonLocation', installDir);
64052
- // https://cmake.org/cmake/help/latest/module/FindPython.html#module:FindPython
64053
- core.exportVariable('Python_ROOT_DIR', installDir);
64054
- // https://cmake.org/cmake/help/latest/module/FindPython2.html#module:FindPython2
64055
- core.exportVariable('Python2_ROOT_DIR', installDir);
64056
- // https://cmake.org/cmake/help/latest/module/FindPython3.html#module:FindPython3
64057
- core.exportVariable('Python3_ROOT_DIR', installDir);
64058
- core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
64059
64051
if (utils_1.IS_LINUX) {
64060
64052
const libPath = process.env.LD_LIBRARY_PATH
64061
64053
? `:${process.env.LD_LIBRARY_PATH}`
@@ -64071,6 +64063,14 @@ function useCpythonVersion(version, architecture, updateEnvironment) {
64071
64063
if (updateEnvironment) {
64072
64064
core.exportVariable('pythonLocation', installDir);
64073
64065
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
64066
+ core.exportVariable('pythonLocation', installDir);
64067
+ // https://cmake.org/cmake/help/latest/module/FindPython.html#module:FindPython
64068
+ core.exportVariable('Python_ROOT_DIR', installDir);
64069
+ // https://cmake.org/cmake/help/latest/module/FindPython2.html#module:FindPython2
64070
+ core.exportVariable('Python2_ROOT_DIR', installDir);
64071
+ // https://cmake.org/cmake/help/latest/module/FindPython3.html#module:FindPython3
64072
+ core.exportVariable('Python3_ROOT_DIR', installDir);
64073
+ core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
64074
64074
if (utils_1.IS_LINUX) {
64075
64075
const libPath = process.env.LD_LIBRARY_PATH
64076
64076
? `:${process.env.LD_LIBRARY_PATH}`
0 commit comments