Remove CMake conditionals and make FindPython REQUIRED

As per review, partio specifies CMake 3.15 or newer so backwards compatibility is not required. Also build should fail if FindPython doesn't find Python. Signed-off-by: Jean-Francois Panisset <[email protected]>
wdas · Feb 28, 2024 · c07f329 · c07f329
1 parent e81e9c5
commit c07f329
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -121,12 +121,7 @@ set(OpenGL_GL_PREFERENCE GLVND)
 find_package(Threads REQUIRED)
 find_package(GLUT REQUIRED)
 find_package(OpenGL REQUIRED)
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.12")
-    find_package(Python COMPONENTS Interpreter Development)
-else()
-    find_package(PythonInterp REQUIRED)
-    find_package(PythonLibs REQUIRED)
-endif()
+find_package(Python REQUIRED 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,11 +52,7 @@ target_include_directories(
 )
 target_link_libraries(partio_mod PRIVATE ${PYTHON_LIBRARIES} partio)
 
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.12")
-    set(PYTHON_DEST "${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages" )
-else()
-    set(PYTHON_DEST "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages" )
-endif()
+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,11 +50,7 @@ else()
     endforeach(item)
 
     foreach(item testpartjson testpartio)
-        if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.12")
-            add_test(NAME ${item} COMMAND ${Python_EXECUTABLE} -B ${CMAKE_CURRENT_SOURCE_DIR}/${item}.py)
-        else()
-            add_test(NAME ${item} COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_CURRENT_SOURCE_DIR}/${item}.py)
-        endif()
+        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,9 +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)
 
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.12")
-    set(PYTHON_DEST "${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages" )
-else()
-    set(PYTHON_DEST "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages" )
-endif()
+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})