Skip to content

Commit

Permalink
Change target names (#327)
Browse files Browse the repository at this point in the history
* Change target names

* This can be reverted, but it is related

* Fix also tbb population

* MakeAvailable for the win

* Revert "This can be reverted, but it is related"

This reverts commit 59b5d21.
  • Loading branch information
tizianoGuadagnino authored Apr 17, 2024
1 parent 0c55593 commit 670e4ab
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 17 deletions.
9 changes: 4 additions & 5 deletions cpp/kiss_icp/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
add_library(core STATIC)
add_library(kiss_icp::core ALIAS core)
target_sources(core PRIVATE Registration.cpp Deskew.cpp VoxelHashMap.cpp Preprocessing.cpp Threshold.cpp)
target_link_libraries(core PUBLIC Eigen3::Eigen tsl::robin_map TBB::tbb Sophus::Sophus)
set_global_target_properties(core)
add_library(kiss_icp_core STATIC)
target_sources(kiss_icp_core PRIVATE Registration.cpp Deskew.cpp VoxelHashMap.cpp Preprocessing.cpp Threshold.cpp)
target_link_libraries(kiss_icp_core PUBLIC Eigen3::Eigen tsl::robin_map TBB::tbb Sophus::Sophus)
set_global_target_properties(kiss_icp_core)
9 changes: 4 additions & 5 deletions cpp/kiss_icp/metrics/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
add_library(metrics STATIC)
add_library(kiss_icp::metrics ALIAS metrics)
target_sources(metrics PRIVATE Metrics.cpp)
target_link_libraries(metrics PUBLIC Eigen3::Eigen)
set_global_target_properties(metrics)
add_library(kiss_icp_metrics STATIC)
target_sources(kiss_icp_metrics PRIVATE Metrics.cpp)
target_link_libraries(kiss_icp_metrics PUBLIC Eigen3::Eigen)
set_global_target_properties(kiss_icp_metrics)
9 changes: 4 additions & 5 deletions cpp/kiss_icp/pipeline/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

add_library(pipeline STATIC)
add_library(kiss_icp::pipeline ALIAS pipeline)
target_sources(pipeline PRIVATE KissICP.cpp)
target_link_libraries(pipeline PUBLIC kiss_icp::core)
set_global_target_properties(pipeline)
add_library(kiss_icp_pipeline STATIC)
target_sources(kiss_icp_pipeline PRIVATE KissICP.cpp)
target_link_libraries(kiss_icp_pipeline PUBLIC kiss_icp_core)
set_global_target_properties(kiss_icp_pipeline)
2 changes: 1 addition & 1 deletion python/kiss_icp/pybind/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
pybind11_add_module(kiss_icp_pybind MODULE kiss_icp_pybind.cpp)
target_link_libraries(kiss_icp_pybind PRIVATE kiss_icp::core kiss_icp::metrics)
target_link_libraries(kiss_icp_pybind PRIVATE kiss_icp_core kiss_icp_metrics)
install(TARGETS kiss_icp_pybind DESTINATION .)
2 changes: 1 addition & 1 deletion ros/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ find_package(tf2_ros REQUIRED)
add_library(odometry_component SHARED src/OdometryServer.cpp)
target_compile_features(odometry_component PUBLIC cxx_std_20)
target_include_directories(odometry_component PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
target_link_libraries(odometry_component kiss_icp::pipeline)
target_link_libraries(odometry_component kiss_icp_pipeline)
ament_target_dependencies(
odometry_component
rcutils
Expand Down

0 comments on commit 670e4ab

Please sign in to comment.