test111

Signed-off-by: Cary Phillips <[email protected]>
cary-ilm · Jan 24, 2024 · ee48166 · ee48166
1 parent 310862c
commit ee48166
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
@@ -95,8 +95,6 @@ jobs:
 
       - name: Build wheels
         run: |
-          find ${{github.workspace}}
-          echo ${{github.workspace}}/_install > cmake_prefix_path
           python -m cibuildwheel --output-dir wheelhouse
         working-directory: src/wrappers/python
 

diff --git a/src/wrappers/python/CMakeLists.txt b/src/wrappers/python/CMakeLists.txt
@@ -9,17 +9,22 @@ endif()
 
 add_library (PyOpenEXR SHARED OpenEXR.cpp)
 
-set (Python_ADDITIONAL_VERSIONS 3)
-find_package (Python3 COMPONENTS Interpreter Development)
+find_package(Python COMPONENTS Interpreter Development)
+if(NOT TARGET Python::Interpreter AND NOT TARGET Python::Python)
+  message(WARNING "Unable to find any python interpreter or libraries")
+  return()
+else()
+  message(STATUS "Found python libraries: ${PYTHON_LIBRARIES}")
+endif()
 
-include_directories ("${Python3_INCLUDE_DIRS}")
+include_directories ("${PYTHON_INCLUDE_DIRS}")
 
 set_target_properties (PyOpenEXR PROPERTIES PREFIX "")
 set_target_properties (PyOpenEXR PROPERTIES OUTPUT_NAME "OpenEXR")
 set_target_properties (PyOpenEXR PROPERTIES SUFFIX ".so")
 set_target_properties (PyOpenEXR PROPERTIES DEBUG_POSTFIX "")
 
-target_link_libraries (PyOpenEXR "${Python3_LIBRARIES}" OpenEXR::OpenEXR)
+target_link_libraries (PyOpenEXR "${PYTHON_LIBRARIES}" OpenEXR::OpenEXR)
 
 configure_file(Imath.py ${CMAKE_CURRENT_BINARY_DIR}/Imath.py COPYONLY)