BLD: Find Python is more robust way

RUrlus · May 22, 2022 · 7405bbd · 7405bbd
1 parent 6b01bea
commit 7405bbd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -184,7 +184,10 @@ ELSE()
     # ##############################################################################
     #                                REQUIREMENTS                                  #
     # ##############################################################################
-    FIND_PACKAGE(Python3 COMPONENTS Development.Module NumPy REQUIRED)
+    FIND_PACKAGE(Python3 COMPONENTS Development NumPy QUIET)
+    IF (NOT Python3_FOUND)
+        FIND_PACKAGE(Python3 COMPONENTS Development.Module NumPy REQUIRED)
+    ENDIF()
 
     # Needed to ensure the same Python executable is found by Pybind11
     IF (NOT DEFINED PYTHON_EXECUTABLE)

diff --git a/cmake/carmaDependencyTargets.cmake b/cmake/carmaDependencyTargets.cmake
@@ -3,9 +3,15 @@
 # ##############################################################################
 # Python and Numpy dependencies
 IF (carma_FIND_REQUIRED)
-    FIND_PACKAGE(Python3 COMPONENTS Interpreter Development NumPy REQUIRED)
+    FIND_PACKAGE(Python3 COMPONENTS Development NumPy QUIET)
+    IF (NOT Python3_FOUND)
+        FIND_PACKAGE(Python3 COMPONENTS Development.Module NumPy REQUIRED)
+    ENDIF()
 ELSE ()
-    FIND_PACKAGE(Python3 COMPONENTS Interpreter Development NumPy)
+    FIND_PACKAGE(Python3 COMPONENTS Development NumPy QUIET)
+    IF (NOT Python3_FOUND)
+        FIND_PACKAGE(Python3 COMPONENTS Development.Module NumPy)
+    ENDIF()
 ENDIF ()
 IF (Python3_FOUND)
     LIST(APPEND carma_INCLUDE_DIRS ${Python3_INCLUDE_DIRS})