switch from custom FindPython to cmake's

lcm-proj · Mar 28, 2023 · 9e827af · 9e827af
1 parent 2ab86d3
commit 9e827af
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 29 deletions.
diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake
diff --git a/lcm-cmake/lcmUtilities.cmake b/lcm-cmake/lcmUtilities.cmake
@@ -490,7 +490,7 @@ function(lcm_install_python)
       return()
     endif()
     execute_process(
-      COMMAND "${PYTHON_EXECUTABLE}" -c "if True:
+      COMMAND "${Python_EXECUTABLE}" -c "if True:
         from distutils import sysconfig as sc
         print(sc.get_python_lib(prefix='', plat_specific=True))"
       OUTPUT_VARIABLE _DESTINATION

diff --git a/lcm-python/CMakeLists.txt b/lcm-python/CMakeLists.txt
@@ -1,5 +1,8 @@
+# FindPython added in 3.12
+cmake_minimum_required(VERSION 3.12)
+
 execute_process(
-  COMMAND "${PYTHON_EXECUTABLE}" -c "if True:
+  COMMAND "${Python_EXECUTABLE}" -c "if True:
     from sysconfig import get_path
     from os.path import sep
     print(get_path('platlib').replace(get_path('data') + sep, ''))"
@@ -25,8 +28,10 @@ if (WIN32 AND NOT CYGWIN)
   set_target_properties(lcm-python PROPERTIES SUFFIX .pyd)
 endif ()
 
+find_package (Python COMPONENTS Interpreter Development)
+
 target_include_directories(lcm-python PRIVATE
-  ${PYTHON_INCLUDE_DIR}
+  ${Python_INCLUDE_DIRS}
 )
 
 target_link_libraries(lcm-python PRIVATE
@@ -37,7 +42,7 @@ if(APPLE)
   set_target_properties(lcm-python PROPERTIES LINK_FLAGS "-undefined dynamic_lookup -Wl,-no_fixup_chains")
 else()
   target_link_libraries(lcm-python PRIVATE
-    ${PYTHON_LIBRARY}
+    ${Python_LIBRARIES}
   )
 endif()
 

diff --git a/test/c/CMakeLists.txt b/test/c/CMakeLists.txt
@@ -19,9 +19,9 @@ target_link_libraries(test-c-udpm_test ${test_c_libs})
 add_test(NAME C::memq_test COMMAND test-c-memq_test)
 add_test(NAME C::eventlog_test COMMAND test-c-eventlog_test)
 
-if(PYTHON_EXECUTABLE)
+if(Python_EXECUTABLE)
   add_test(NAME C::client_server COMMAND
-    ${PYTHON_EXECUTABLE}
+    ${Python_EXECUTABLE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../run_client_server_test.py
     $<TARGET_FILE:test-c-server>
     $<TARGET_FILE:test-c-client>)

diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt
@@ -11,9 +11,9 @@ lcm_target_link_libraries(test-cpp-memq_test ${test_cpp_libs})
 
 add_test(NAME CPP::memq_test COMMAND test-cpp-memq_test)
 
-if(PYTHON_EXECUTABLE)
+if(Python_EXECUTABLE)
   add_test(NAME CPP::client_server COMMAND
-    ${PYTHON_EXECUTABLE}
+    ${Python_EXECUTABLE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../run_client_server_test.py
     $<TARGET_FILE:test-c-server>
     $<TARGET_FILE:test-cpp-client>)

diff --git a/test/go/CMakeLists.txt b/test/go/CMakeLists.txt
@@ -1,10 +1,10 @@
 find_program(GO_EXECUTABLE go)
 
-if(PYTHON_EXECUTABLE AND GO_EXECUTABLE)
+if(Python_EXECUTABLE AND GO_EXECUTABLE)
   add_test(NAME Go::client_server COMMAND
     ${CMAKE_COMMAND} -E env
       "GOPATH=${lcm_BINARY_DIR}/test/types/go:${GOPATH}"
-      ${PYTHON_EXECUTABLE}
+      ${Python_EXECUTABLE}
       ${CMAKE_CURRENT_SOURCE_DIR}/../run_client_server_test.py
       $<TARGET_FILE:test-c-server>
       ${GO_EXECUTABLE} test ${CMAKE_CURRENT_SOURCE_DIR}/client_test.go)

diff --git a/test/java/CMakeLists.txt b/test/java/CMakeLists.txt
@@ -28,7 +28,7 @@ if(NOT WIN32)
 endif()
 
 add_test(NAME Java::client_server COMMAND
-  ${PYTHON_EXECUTABLE}
+  ${Python_EXECUTABLE}
   ${CMAKE_CURRENT_SOURCE_DIR}/../run_client_server_test.py
   $<TARGET_FILE:test-c-server>
   ${Java_JAVA_EXECUTABLE} -cp "${lcm-test-java_CLASSPATH}" LcmTestClient)
diff --git a/test/lua/CMakeLists.txt b/test/lua/CMakeLists.txt
@@ -4,12 +4,12 @@ set(LUA_PATH
   ${lcm_BINARY_DIR}/test/types/?.lua
   ${lcm_BINARY_DIR}/test/types/?/init.lua)
 
-if(PYTHON_EXECUTABLE AND LUA_EXECUTABLE)
+if(Python_EXECUTABLE AND LUA_EXECUTABLE)
   add_test(NAME Lua::client_server COMMAND
     ${CMAKE_COMMAND} -E env
       "LUA_PATH=${LUA_PATH}"
       "LUA_CPATH=$<TARGET_FILE:lcm-lua>"
-    ${PYTHON_EXECUTABLE}
+    ${Python_EXECUTABLE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../run_client_server_test.py
     $<TARGET_FILE:test-c-server>
     ${LUA_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/client.lua)

diff --git a/test/python/CMakeLists.txt b/test/python/CMakeLists.txt
@@ -9,7 +9,7 @@ function(add_python_test NAME SCRIPT)
   get_filename_component(SCRIPT ${SCRIPT} ABSOLUTE)
   add_test(NAME ${NAME} COMMAND
     ${CMAKE_COMMAND} -E env "PYTHONPATH=${PYTHON_PATH}"
-    ${PYTHON_EXECUTABLE} ${SCRIPT} ${ARGN})
+    ${Python_EXECUTABLE} ${SCRIPT} ${ARGN})
 endfunction()
 
 add_python_test(Python::bool_test bool_test.py)
@@ -22,4 +22,4 @@ add_python_test(Python::lcm_udpm_queue_issue_test lcm_udpm_queue_issue_test.py)
 add_python_test(Python::client_server
   ../run_client_server_test.py
   $<TARGET_FILE:test-c-server>
-  ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/client.py)
+  ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/client.py)