Skip to content

Commit

Permalink
renamed packages to unique names
Browse files Browse the repository at this point in the history
  • Loading branch information
petrlmat committed Dec 31, 2024
1 parent a842593 commit cc94493
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 70 deletions.
14 changes: 7 additions & 7 deletions camera_model/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
project(camera_model)
project(vins_mono_camera_model)

# Enable compile optimizations
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fPIC -fsee -fomit-frame-pointer -fno-signed-zeros -fno-math-errno -funroll-loops")
Expand All @@ -26,7 +26,7 @@ find_package(Ceres REQUIRED)

catkin_package(
INCLUDE_DIRS include
LIBRARIES camera_model
LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS ${CATKIN_DEPENDENCIES}
)

Expand All @@ -37,7 +37,7 @@ include_directories(
${Boost_INCLUDE_DIRS}
)

add_executable(Calibration
add_executable(vins_mono_calibration
src/intrinsic_calib.cc
src/chessboard/Chessboard.cc
src/calib/CameraCalibration.cc
Expand All @@ -52,7 +52,7 @@ add_executable(Calibration
src/gpl/gpl.cc
src/gpl/EigenQuaternionParameterization.cc)

add_library(camera_model
add_library(${PROJECT_NAME}
src/chessboard/Chessboard.cc
src/calib/CameraCalibration.cc
src/camera_models/Camera.cc
Expand All @@ -66,14 +66,14 @@ add_library(camera_model
src/gpl/gpl.cc
src/gpl/EigenQuaternionParameterization.cc)

target_link_libraries(Calibration ${Boost_LIBRARIES} ${OpenCV_LIBS} ${CERES_LIBRARIES})
target_link_libraries(camera_model ${Boost_LIBRARIES} ${OpenCV_LIBS} ${CERES_LIBRARIES})
target_link_libraries(vins_mono_calibration ${Boost_LIBRARIES} ${OpenCV_LIBS} ${CERES_LIBRARIES})
target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES} ${OpenCV_LIBS} ${CERES_LIBRARIES})

## --------------------------------------------------------------
## | Install |
## --------------------------------------------------------------

install(TARGETS camera_model
install(TARGETS ${PROJECT_NAME} vins_mono_calibration
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
Expand Down
44 changes: 5 additions & 39 deletions camera_model/package.xml
Original file line number Diff line number Diff line change
@@ -1,54 +1,20 @@
<?xml version="1.0"?>
<package format="3">
<name>camera_model</name>
<name>vins_mono_camera_model</name>
<version>0.0.0</version>
<description>The camera_model package</description>
<description>The vins_mono_camera_model package</description>

<!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- Example: -->
<!-- <maintainer email="[email protected]">Jane Doe</maintainer> -->
<maintainer email="[email protected]">dvorak</maintainer>
<maintainer email="[email protected]">Matej Petrlik</maintainer>

<license>MIT</license>

<!-- One license tag required, multiple allowed, one license per tag -->
<!-- Commonly used license strings: -->
<!-- BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
<license>TODO</license>
<author email="[email protected]">dvorak</author>


<!-- Url tags are optional, but mutiple are allowed, one per tag -->
<!-- Optional attribute type can be: website, bugtracker, or repository -->
<!-- Example: -->
<!-- <url type="website">http://wiki.ros.org/camera_model</url> -->


<!-- Author tags are optional, mutiple are allowed, one per tag -->
<!-- Authors do not have to be maintianers, but could be -->
<!-- Example: -->
<!-- <author email="[email protected]">Jane Doe</author> -->


<!-- The *_depend tags are used to specify dependencies -->
<!-- Dependencies can be catkin packages or system dependencies -->
<!-- Examples: -->
<!-- Use build_depend for packages you need at compile time: -->
<!-- <build_depend>message_generation</build_depend> -->
<!-- Use buildtool_depend for build tool packages: -->
<!-- <buildtool_depend>catkin</buildtool_depend> -->
<!-- Use run_depend for packages you need at runtime: -->
<!-- <run_depend>message_runtime</run_depend> -->
<!-- Use test_depend for packages you need only for testing: -->
<!-- <test_depend>gtest</test_depend> -->
<buildtool_depend>catkin</buildtool_depend>
<depend>roscpp</depend>
<depend>std_msgs</depend>
<depend>libboost-program-options-dev</depend>
<depend>libopencv-dev</depend>
<depend>libceres-dev</depend>

<!-- The export tag contains other, unspecified, tags -->
<export>
<!-- Other tools can request additional information be placed here -->

</export>
</package>
12 changes: 6 additions & 6 deletions feature_tracker/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
project(feature_tracker)
project(vins_mono_feature_tracker)

# Enable compile optimizations
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fsee -fomit-frame-pointer -fno-signed-zeros -fno-math-errno -funroll-loops")
Expand All @@ -12,7 +12,7 @@ set(CATKIN_DEPENDENCIES
std_msgs
sensor_msgs
cv_bridge
camera_model
vins_mono_camera_model
)

find_package(catkin REQUIRED COMPONENTS
Expand All @@ -34,24 +34,24 @@ include_directories(

set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)

add_executable(feature_tracker
add_executable(${PROJECT_NAME}
src/feature_tracker_node.cpp
src/parameters.cpp
src/feature_tracker.cpp
)

add_dependencies(feature_tracker
add_dependencies(${PROJECT_NAME}
${${PROJECT_NAME}_EXPORTED_TARGETS}
${catkin_EXPORTED_TARGETS}
)

target_link_libraries(feature_tracker ${catkin_LIBRARIES} ${OpenCV_LIBS})
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${OpenCV_LIBS})

## --------------------------------------------------------------
## | Install |
## --------------------------------------------------------------

install(TARGETS feature_tracker
install(TARGETS ${PROJECT_NAME}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
Expand Down
4 changes: 2 additions & 2 deletions feature_tracker/package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<package format="3">
<name>feature_tracker</name>
<name>vins_mono_feature_tracker</name>
<version>0.0.0</version>
<description>The feature_tracker package</description>

Expand All @@ -17,6 +17,6 @@
<depend>message_runtime</depend>
<depend>libopencv-dev</depend>
<depend>cv_bridge</depend>
<depend>camera_model</depend>
<depend>vins_mono_camera_model</depend>

</package>
16 changes: 10 additions & 6 deletions pose_graph/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
project(pose_graph)
project(vins_mono_pose_graph)

# Enable compile optimizations
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fsee -fomit-frame-pointer -fno-signed-zeros -fno-math-errno -funroll-loops")
Expand All @@ -9,12 +9,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3 -Wall -Wuninitialized -Wmaybe-uninit

set(CATKIN_DEPENDENCIES
roscpp
roslib
std_msgs
nav_msgs
visualization_msgs
camera_model
cv_bridge
roslib
vins_mono_camera_model
)

find_package(catkin REQUIRED COMPONENTS
Expand All @@ -39,7 +39,7 @@ include_directories(

set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)

add_executable(pose_graph
add_executable(${PROJECT_NAME}
src/pose_graph_node.cpp
src/pose_graph.cpp
src/keyframe.cpp
Expand All @@ -55,13 +55,17 @@ add_executable(pose_graph
src/ThirdParty/VocabularyBinary.cpp
)

target_link_libraries(pose_graph ${catkin_LIBRARIES} ${OpenCV_LIBS} ${CERES_LIBRARIES})
target_link_libraries(${PROJECT_NAME}
${catkin_LIBRARIES}
${OpenCV_LIBS}
${CERES_LIBRARIES}
)

## --------------------------------------------------------------
## | Install |
## --------------------------------------------------------------

install(TARGETS ${LIBRARIES}
install(TARGETS ${PROJECT_NAME}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
Expand Down
6 changes: 3 additions & 3 deletions pose_graph/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>pose_graph</name>
<version>0.0.1</version>
<name>vins_mono_pose_graph</name>
<version>1.0.0</version>
<description>pose_graph package</description>

<maintainer email="[email protected]">Matej Petrlik</maintainer>
Expand All @@ -19,6 +19,6 @@
<depend>cv_bridge</depend>
<depend>libceres-dev</depend>
<depend>libopencv-dev</depend>
<depend>camera_model</depend>
<depend>vins_mono_camera_model</depend>

</package>
14 changes: 9 additions & 5 deletions vins_estimator/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.3)
project(vins_estimator)
project(vins_mono_vins_estimator)

# Enable compile optimizations
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fsee -fomit-frame-pointer -fno-signed-zeros -fno-math-errno -funroll-loops")
Expand Down Expand Up @@ -40,7 +40,7 @@ catkin_package(
CATKIN_DEPENDS ${CATKIN_DEPENDENCIES}
)

add_executable(vins_estimator
add_executable(${PROJECT_NAME}
src/estimator_node.cpp
src/parameters.cpp
src/estimator.cpp
Expand All @@ -58,18 +58,22 @@ add_executable(vins_estimator
src/initial/initial_ex_rotation.cpp
)

add_dependencies(vins_estimator
add_dependencies(${PROJECT_NAME}
${${PROJECT_NAME}_EXPORTED_TARGETS}
${catkin_EXPORTED_TARGETS}
)

target_link_libraries(vins_estimator ${catkin_LIBRARIES} ${OpenCV_LIBS} ${CERES_LIBRARIES})
target_link_libraries(${PROJECT_NAME}
${catkin_LIBRARIES}
${OpenCV_LIBS}
${CERES_LIBRARIES}
)

## --------------------------------------------------------------
## | Install |
## --------------------------------------------------------------

install(TARGETS vins_estimator
install(TARGETS ${PROJECT_NAME}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
Expand Down
3 changes: 1 addition & 2 deletions vins_estimator/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<package format="3">

<name>vins_estimator</name>
<name>vins_mono_vins_estimator</name>
<version>1.0.0</version>
<description>The vins_estimator package</description>

Expand Down

0 comments on commit cc94493

Please sign in to comment.