From fd3c960b07709979143f4482a88fe6b20263bf80 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 11 Sep 2020 15:16:24 +0200
Subject: [PATCH] [CMake] sync submodule and its use
---
CMakeLists.txt | 3 +--
cmake | 2 +-
python/CMakeLists.txt | 2 +-
tests/CMakeLists.txt | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 277278f..db8f618 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,9 +27,8 @@ IF(BUILD_PYTHON_INTERFACE)
FINDPYTHON()
FIND_NUMPY()
STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME})
+ SEARCH_FOR_BOOST_PYTHON(REQUIRED)
ADD_PROJECT_DEPENDENCY(eigenpy REQUIRED)
- SET(BOOST_COMPONENTS python)
- SEARCH_FOR_BOOST()
ENDIF(BUILD_PYTHON_INTERFACE)
# Project dependencies
diff --git a/cmake b/cmake
index a61ae61..32015cb 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit a61ae61479a1d50d1ae3c988d1d9aaf20841173d
+Subproject commit 32015cb28d977b592227675665d17d11531ef418
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 8697388..e50ba63 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -1,6 +1,6 @@
# Define the wrapper library that wraps our library
add_library(${PY_NAME} SHARED bezier_com_traj.cpp )
-target_link_libraries(${PY_NAME} ${Boost_LIBRARIES} ${PROJECT_NAME} eigenpy::eigenpy)
+target_link_libraries(${PY_NAME} ${PROJECT_NAME} eigenpy::eigenpy)
# don't prepend wrapper library name with lib
set_target_properties(${PY_NAME} PROPERTIES PREFIX "")
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8fe037c..9ff9ef0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,5 +7,5 @@ SET(${PROJECT_NAME}_TESTS
FOREACH(test ${${PROJECT_NAME}_TESTS})
ADD_UNIT_TEST("${test}" "test-${test}")
- TARGET_LINK_LIBRARIES(${test} ${Boost_LIBRARIES} ${PROJECT_NAME})
+ TARGET_LINK_LIBRARIES(${test} ${PROJECT_NAME})
ENDFOREACH(test)
--
GitLab