Add CMake hints

actions · Jun 28, 2022 · 31fd3d4 · 31fd3d4
1 parent ffcd000
commit 31fd3d4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -63994,6 +63994,12 @@ function findPyPyVersion(versionSpec, architecture) {
         const pythonPath = path.join(utils_1.IS_WINDOWS ? installDir : _binDir, `python${binaryExtension}`);
         const pythonLocation = pypyInstall.getPyPyBinaryPath(installDir);
         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);
@@ -64150,6 +64156,12 @@ function useCpythonVersion(version, architecture) {
             ].join(os.EOL));
         }
         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', installDir + '/lib/pkgconfig');
         if (utils_1.IS_LINUX) {
             const libPath = process.env.LD_LIBRARY_PATH

diff --git a/src/find-pypy.ts b/src/find-pypy.ts
@@ -55,6 +55,12 @@ export async function findPyPyVersion(
   );
   const pythonLocation = pypyInstall.getPyPyBinaryPath(installDir);
   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);

diff --git a/src/find-python.ts b/src/find-python.ts
@@ -70,6 +70,12 @@ export async function useCpythonVersion(
   }
 
   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', installDir + '/lib/pkgconfig');
 
   if (IS_LINUX) {