Add Python version to pxrConfig.cmake

PixarAnimationStudios · Nov 15, 2022 · 3294fc0 · 3294fc0
1 parent 9d21755
commit 3294fc0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/build_scripts/build_usd.py b/build_scripts/build_usd.py
@@ -1680,6 +1680,9 @@ def InstallUSD(context, force, buildArgs):
                 extraArgs.append('-D{prefix}_INCLUDE_DIR="{pyIncPath}"'
                                  .format(prefix=prefix,
                                          pyIncPath=pythonInfo[2]))
+                extraArgs.append('-D{prefix}_VERSION="{pyVersion}"'
+                                 .format(prefix=prefix,
+                                         pyVersion=pythonInfo[3]))
         else:
             extraArgs.append('-DPXR_ENABLE_PYTHON_SUPPORT=OFF')
 

diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
@@ -35,7 +35,11 @@ if(@PXR_ENABLE_PYTHON_SUPPORT@)
             set(Python3_INCLUDE_DIR "@Python3_INCLUDE_DIR@")
         endif()
 
-        find_package(Python3 COMPONENTS Development REQUIRED)
+        if (NOT "@Python3_VERSION@" STREQUAL "")
+            find_package(Python3 "@Python3_VERSION@" EXACT COMPONENTS Development REQUIRED)
+        else()
+            find_package(Python3 COMPONENTS Development REQUIRED)
+        endif()
     else()
         if (NOT DEFINED Python2_EXECUTABLE AND "@Python2_EXECUTABLE@")
             set(Python2_EXECUTABLE "@Python2_EXECUTABLE@")
@@ -49,7 +53,11 @@ if(@PXR_ENABLE_PYTHON_SUPPORT@)
             set(Python2_INCLUDE_DIR "@Python2_INCLUDE_DIR@")
         endif()
 
-        find_package(Python2 COMPONENTS Development REQUIRED)
+        if (NOT "@Python2_VERSION@" STREQUAL "")
+            find_package(Python2 "@Python2_VERSION@" EXACT COMPONENTS Development REQUIRED)
+        else()
+            find_package(Python2 COMPONENTS Development REQUIRED)
+        endif()
     endif()
 
 endif()