Fix Python (#1401)

google · Mar 8, 2024 · 4f37872 · 4f37872
1 parent f50d674
commit 4f37872
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -91,22 +91,18 @@ if (COMPILER_SUPPORTS_EXTRA_SEMI_WARNING)
     add_compile_options("-Wextra-semi")
 endif()
 
-if(${CMAKE_VERSION} VERSION_LESS_EQUAL "3.12")
-  find_package(PythonInterp 3 REQUIRED)
-else ()
-  find_package(Python COMPONENTS Interpreter REQUIRED)
-endif ()
+find_package(Python COMPONENTS Interpreter REQUIRED)
 
 if (SHADERC_ENABLE_COPYRIGHT_CHECK)
   add_custom_target(check-copyright ALL
-    ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py
+    ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py
     --check
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     COMMENT "Check copyright")
 endif()
 
 add_custom_target(add-copyright
-  ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py
+  ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   COMMENT "Add copyright")
 
@@ -134,7 +130,7 @@ if(${SHADERC_ENABLE_EXAMPLES})
 endif()
 
 add_custom_target(build-version
-  ${PYTHON_EXECUTABLE}
+  ${Python_EXECUTABLE}
   ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
   ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
   COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")

diff --git a/cmake/setup_build.cmake b/cmake/setup_build.cmake
@@ -49,11 +49,7 @@ if (ANDROID)
 find_host_package(PythonInterp 3 REQUIRED)
 find_host_package(BISON)
 else()
-  if(${CMAKE_VERSION} VERSION_LESS_EQUAL "3.12")
-    find_package(PythonInterp 3 REQUIRED)
-  else ()
-    find_package(Python COMPONENTS Interpreter REQUIRED)
-  endif ()
+  find_package(Python COMPONENTS Interpreter REQUIRED)
 endif()
 
 option(DISABLE_RTTI "Disable RTTI in builds")

diff --git a/glslc/test/CMakeLists.txt b/glslc/test/CMakeLists.txt
@@ -13,15 +13,15 @@
 # limitations under the License.
 
 add_test(NAME shaderc_expect_unittests
-         COMMAND ${PYTHON_EXECUTABLE} -m unittest expect_unittest.py
+         COMMAND ${Python_EXECUTABLE} -m unittest expect_unittest.py
          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 add_test(NAME shaderc_glslc_test_framework_unittests
-         COMMAND ${PYTHON_EXECUTABLE} -m unittest glslc_test_framework_unittest.py
+         COMMAND ${Python_EXECUTABLE} -m unittest glslc_test_framework_unittest.py
          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(${SHADERC_ENABLE_TESTS})
   add_test(NAME glslc_tests
-    COMMAND ${PYTHON_EXECUTABLE}
+    COMMAND ${Python_EXECUTABLE}
     ${CMAKE_CURRENT_SOURCE_DIR}/glslc_test_framework.py
     $<TARGET_FILE:glslc_exe> $<TARGET_FILE:spirv-dis>
     --test-dir ${CMAKE_CURRENT_SOURCE_DIR})