Update CMake Python detection

CMake 3.12 adds FindPython which replaces FindPythonInterp and FindPythonLibs and updates corresponding result variables. As of CMake 3.27 you must set CMP0148 to OLD to retain this behavior. This PR updates CMake code to the new behavior while retaining support for older CMake versions. Signed-off-by: Jean-Francois Panisset <[email protected]>
wdas · Feb 28, 2024 · 6005f60 · 6005f60
1 parent 321ae0e
commit 6005f60
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -121,8 +121,7 @@ set(OpenGL_GL_PREFERENCE GLVND)
 find_package(Threads REQUIRED)
 find_package(GLUT REQUIRED)
 find_package(OpenGL REQUIRED)
-find_package(PythonInterp REQUIRED)
-find_package(PythonLibs REQUIRED)
+find_package(Python COMPONENTS Interpreter Development)
 find_package(ZLIB)
 if (ZLIB_FOUND)
     add_definitions(-DPARTIO_USE_ZLIB)

diff --git a/src/py/CMakeLists.txt b/src/py/CMakeLists.txt
@@ -52,7 +52,7 @@ target_include_directories(
 )
 target_link_libraries(partio_mod PRIVATE ${PYTHON_LIBRARIES} partio)
 
-set(PYTHON_DEST "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages" )
+set(PYTHON_DEST "${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages" )
 
 install(TARGETS partio_mod DESTINATION ${PYTHON_DEST})
 install(FILES partio.i DESTINATION ${CMAKE_INSTALL_DATADIR}/swig)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -50,7 +50,7 @@ else()
     endforeach(item)
 
     foreach(item testpartjson testpartio)
-        add_test(NAME ${item} COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_CURRENT_SOURCE_DIR}/${item}.py)
+        add_test(NAME ${item} COMMAND ${Python_EXECUTABLE} -B ${CMAKE_CURRENT_SOURCE_DIR}/${item}.py)
         install(PROGRAMS ${item}.py DESTINATION ${CMAKE_INSTALL_PARTIO_TESTDIR} RENAME ${item})
     endforeach(item)
 endif()
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
@@ -67,5 +67,5 @@ install(PROGRAMS partedit.py DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME partedit
 install(PROGRAMS partjson.py DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME partjson)
 install(PROGRAMS partinspect.py DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME partinspect)
 
-set(PYTHON_DEST "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages" )
+set(PYTHON_DEST "${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages" )
 install(FILES partedit.py partjson.py partinspect.py DESTINATION ${PYTHON_DEST})