From f36a989136f8f5cb5c0e6ba24d87232125842ecd Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Thu, 14 Jul 2022 17:53:36 +0200 Subject: [PATCH] modernize if available --- CMakeLists.txt | 14 +------------- cmake | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aee4723..65b8496 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,19 +32,7 @@ COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX) PROJECT(${PROJECT_NAME} ${PROJECT_ARGS}) IF(BUILD_PYTHON_INTERFACE) - set(PYTHON_COMPONENTS Interpreter) - if(CMAKE_VERSION VERSION_LESS "3.18") - # Development.Module only require headers, so it's best for our module - # But it's not available before CMake 3.18 - set(PYTHON_COMPONENTS ${PYTHON_COMPONENTS} Development) - else() - set(PYTHON_COMPONENTS ${PYTHON_COMPONENTS} Development.Module) - endif() - if(NOT CMAKE_VERSION VERSION_LESS "3.14") - # NumPy provides a standard CMake imported target, - # But it's not available before CMake 3.14 - set(PYTHON_COMPONENTS ${PYTHON_COMPONENTS} NumPy) - endif() + set(PYTHON_COMPONENTS Interpreter Development.Module NumPy) FINDPYTHON() ADD_PROJECT_DEPENDENCY(pinocchio) STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME}) diff --git a/cmake b/cmake index 7c6837d..9d6ba21 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 7c6837de72c724329c93a1d4f107767240d58727 +Subproject commit 9d6ba210c26a330e7bfff9efea9e41c69beb7025 -- GitLab