Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CMake python use for drake_cmake_external #296

Merged
merged 2 commits into from
Aug 22, 2024
Merged

Update CMake python use for drake_cmake_external #296

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c68ce1
Update CMake python use for drake_cmake_external
nicolecheetham Aug 21, 2024
1f5805d
Remove unused python variables
nicolecheetham Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions drake_cmake_external/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# TODO(eric.cousineau): Link to documentation on superproject example pending
# resolution of: https://gitlab.kitware.com/cmake/cmake/issues/18336

cmake_minimum_required(VERSION 3.10.2)
cmake_minimum_required(VERSION 3.16)
project(drake_cmake_external)

if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
Expand All @@ -24,18 +24,7 @@ endif()

list(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}")

if(APPLE)
set(FIND_PYTHON_EXECUTABLE_PATHS /usr/local/bin)
set(FIND_PYTHON_INTERP_VERSION 3.12)
else()
set(FIND_PYTHON_EXECUTABLE_PATHS /usr/bin)
set(FIND_PYTHON_INTERP_VERSION 3.6)
endif()
find_program(PYTHON_EXECUTABLE NAMES python3
PATHS "${FIND_PYTHON_EXECUTABLE_PATHS}"
NO_DEFAULT_PATH
)
find_package(PythonInterp ${FIND_PYTHON_INTERP_VERSION} MODULE REQUIRED)
find_package(Python3 REQUIRED COMPONENTS Interpreter Development)

include(ExternalProject)

Expand Down Expand Up @@ -121,7 +110,7 @@ ExternalProject_Add(drake
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
-DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE}
-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}
-DPYTHON_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE}
-DWITH_USER_EIGEN:BOOLEAN=ON
-DWITH_USER_FMT:BOOLEAN=ON
-DWITH_USER_SPDLOG:BOOLEAN=ON
Expand Down
Loading