Skip to content

Commit 8c852a1

Browse files
authored
Merge pull request #27 from nim65s/devel
CMake: let eigenpy find python
2 parents a4d3135 + 601f4d8 commit 8c852a1

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

CMakeLists.txt

+1-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ ENDIF()
2323

2424
INCLUDE(cmake/base.cmake)
2525
INCLUDE(cmake/boost.cmake)
26-
INCLUDE(cmake/python.cmake)
2726
INCLUDE(cmake/ide.cmake)
2827

2928
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/find-external/CppAD/" ${CMAKE_MODULE_PATH})
@@ -37,11 +36,8 @@ CHECK_MINIMAL_CXX_STANDARD(11 ENFORCE)
3736
OPTION(SUFFIX_SO_VERSION "Suffix library name with its version" ON)
3837
OPTION(BUILD_WITH_CPPAD_CODEGEN_BINDINGS "Build the python bindings for code generation (via CppADCodeGen)" OFF)
3938

40-
FINDPYTHON()
41-
4239
SET_BOOST_DEFAULT_OPTIONS()
4340
ADD_PROJECT_DEPENDENCY(Boost REQUIRED)
44-
SEARCH_FOR_BOOST_PYTHON(REQUIRED)
4541
EXPORT_BOOST_DEFAULT_OPTIONS()
4642

4743
IF(BUILD_WITH_CPPAD_CODEGEN_BINDINGS)
@@ -51,7 +47,7 @@ ENDIF(BUILD_WITH_CPPAD_CODEGEN_BINDINGS)
5147

5248
ADD_PROJECT_DEPENDENCY(cppad 20180000.0 REQUIRED PKG_CONFIG_REQUIRES "cppad >= 20180000.0")
5349
ADD_PROJECT_DEPENDENCY(Eigen3 REQUIRED PKG_CONFIG_REQUIRES "eigen3 >= 3.0.5")
54-
ADD_PROJECT_DEPENDENCY(eigenpy 2.7.6 REQUIRED)
50+
ADD_PROJECT_DEPENDENCY(eigenpy 2.7.14 REQUIRED)
5551

5652
SET(${PROJECT_NAME}_HEADERS
5753
include/${PROJECT_NAME}/fwd.hpp

cmake

Submodule cmake updated 104 files

0 commit comments

Comments
 (0)