[v1.4] fix mavlink build in macOS CI

mavlink · Nov 16, 2023 · 804860c · 804860c
1 parent 958441c
commit 804860c
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/third_party/mavlink/CMakeLists.txt b/third_party/mavlink/CMakeLists.txt
@@ -11,9 +11,20 @@ list(APPEND CMAKE_ARGS
     "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
     )
 
-# Without this GitHub actions picks the wrong python3 executable.
-set(Python3_FIND_REGISTRY "NEVER")
-set(Python3_FIND_FRAMEWORK "NEVER")
+if (POLICY CMP0094)
+    cmake_policy(SET CMP0094 NEW)  # FindPython should return the first matching Python
+endif ()
+
+# Needed to find the right Python on macOS
+if (NOT DEFINED Python_FIND_FRAMEWORK)
+    set(Python_FIND_FRAMEWORK "LAST")
+endif()
+
+# Needed to find the right Python on Windows
+if (NOT DEFINED Python_FIND_REGISTRY)
+    set(Python_FIND_REGISTRY "NEVER")
+endif()
+
 find_package(Python3 COMPONENTS Interpreter REQUIRED)
 
 ExternalProject_add(