Skip to content

Commit

Permalink
Temp commit on build system, opencv version issue...everybody is very
Browse files Browse the repository at this point in the history
surprised about this
  • Loading branch information
tizianoGuadagnino committed Mar 18, 2024
1 parent d0f818d commit 1f9e091
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ editable:
@pip install --no-build-isolation -ve ./python/

cpp:
@cmake -Bbuild cpp/map_closures/
@cmake -Bbuild cpp/
@cmake --build build -j$(nproc --all)
2 changes: 1 addition & 1 deletion cpp/pipeline/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
add_library(pipeline STATIC)
add_library(map_closures::pipeline ALIAS pipeline)
target_sources(pipeline PRIVATE MapClosures.cpp)
target_include_directories(pipeline PUBLIC "${hbst_SOURCE_DIR}")
target_include_directories(pipeline PUBLIC ${hbst_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
target_link_libraries(pipeline PUBLIC map_closures::core Eigen3::Eigen ${OpenCV_LIBS})
set_global_target_properties(pipeline)
4 changes: 2 additions & 2 deletions cpp/pipeline/MapClosures.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
#include <utility>
#include <vector>

#include "map_closures/core/AlignRansac2D.hpp"
#include "map_closures/core/DensityMap.hpp"
#include "core/AlignRansac2D.hpp"
#include "core/DensityMap.hpp"
#include "srrg_hbst/types/binary_tree.hpp"

namespace {
Expand Down
2 changes: 1 addition & 1 deletion python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ set(PYBIND11_NEWPYTHON ON)
find_package(Python COMPONENTS Interpreter Development.Module REQUIRED)
find_package(pybind11 CONFIG REQUIRED)

add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../cpp/map_closures ${CMAKE_CURRENT_BINARY_DIR}/map_closures)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../cpp/ ${CMAKE_CURRENT_BINARY_DIR}/map_closures)

add_subdirectory(map_closures/pybind)
2 changes: 1 addition & 1 deletion python/map_closures/pybind/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# SOFTWARE.

pybind11_add_module(map_closures_pybind MODULE map_closures_pybind.cpp)
target_link_libraries(map_closures_pybind PRIVATE map_closures::pipeline)
target_link_libraries(map_closures_pybind PUBLIC map_closures::pipeline)
install(TARGETS map_closures_pybind DESTINATION .)
add_custom_target(install_python_bindings ${CMAKE_COMMAND} -DCMAKE_INSTALL_COMPONENT=python_bindings -P
"${PROJECT_BINARY_DIR}/cmake_install.cmake" DEPENDS map_closures_pybind)
2 changes: 1 addition & 1 deletion python/map_closures/pybind/map_closures_pybind.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <tuple>
#include <vector>

#include "map_closures/pipeline/MapClosures.hpp"
#include "pipeline/MapClosures.hpp"
#include "stl_vector_eigen.h"

PYBIND11_MAKE_OPAQUE(std::vector<Eigen::Vector3d>);
Expand Down

0 comments on commit 1f9e091

Please sign in to comment.