Skip to content

Commit d309037

Browse files
authored
Merge pull request #327 from nim65s/devel
CMake: update to eigenpy 2.7.10
2 parents ee1a3a3 + 7b68433 commit d309037

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

.github/workflows/conda/conda-env.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88
- assimp
99
- numpy
1010
- boost
11-
- eigenpy=2.7.6
11+
- eigenpy
1212
- python
1313
- doxygen
1414
- lxml

CMakeLists.txt

+1-5
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ IF(NOT EXISTS "${CMAKE_SOURCE_DIR}/cmake/base.cmake")
5959
ENDIF()
6060

6161
include(cmake/boost.cmake)
62-
include(cmake/python.cmake)
6362
include(cmake/hpp.cmake)
6463
include(cmake/apple.cmake)
6564
include(cmake/ide.cmake)
@@ -97,7 +96,7 @@ CMAKE_DEPENDENT_OPTION(GENERATE_PYTHON_STUBS "Generate the Python stubs associat
9796
ADD_PROJECT_DEPENDENCY(Eigen3 REQUIRED PKG_CONFIG_REQUIRES "eigen3 >= 3.0.0")
9897

9998
if(BUILD_PYTHON_INTERFACE)
100-
FIND_PACKAGE(eigenpy 2.2 REQUIRED)
99+
FIND_PACKAGE(eigenpy 2.7.10 REQUIRED)
101100
endif()
102101

103102
# Required dependencies
@@ -109,9 +108,6 @@ ELSE(WIN32)
109108
ADD_PROJECT_DEPENDENCY(Boost REQUIRED chrono serialization)
110109
ENDIF(WIN32)
111110
if(BUILD_PYTHON_INTERFACE)
112-
set(PYTHON_COMPONENTS Interpreter Development.Module NumPy)
113-
FINDPYTHON()
114-
search_for_boost_python(REQUIRED)
115111
find_package(Boost REQUIRED COMPONENTS system)
116112
endif(BUILD_PYTHON_INTERFACE)
117113

cmake

Submodule cmake updated 94 files

0 commit comments

Comments
 (0)