From bf8e073bb58c8f643c97d129c812ab6f9e45f435 Mon Sep 17 00:00:00 2001 From: Hauke Strasdat Date: Fri, 18 Aug 2023 12:15:59 -0700 Subject: [PATCH] refactor-remove-export-modules --- CMakeLists.txt | 23 ----------------------- components/pango_context/CMakeLists.txt | 1 - components/pango_core/CMakeLists.txt | 1 - components/pango_image/CMakeLists.txt | 1 - components/pango_render/CMakeLists.txt | 1 - 5 files changed, 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cbe18098b..367edc815 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,6 @@ set(PANGOLIN_VERSION ${PANGOLIN_VERSION_MAJOR}.${PANGOLIN_VERSION_MINOR}) find_package(Eigen3 3.4.0 REQUIRED) -find_package(farm_ng_core 0.1.0 REQUIRED) -find_package(Sophus REQUIRED) # Prevent in source builds if(EXISTS "${PROJECT_BINARY_DIR}/CMakeLists.txt") @@ -127,9 +125,6 @@ endforeach() ####################################################### ## Build Tree Export -# Export Targets -export(TARGETS ${component_list} FILE PangolinTargets.cmake) -export(PACKAGE Pangolin) # Version information configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake.in @@ -150,24 +145,6 @@ file( RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" ) -install( - TARGETS ${component_list} - EXPORT ${PROJECT_NAME}Targets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin - INCLUDES DESTINATION include -) - -install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" - DESTINATION ${CMAKECONFIG_INSTALL_DIR} -) -install( - EXPORT ${PROJECT_NAME}Targets DESTINATION ${CMAKECONFIG_INSTALL_DIR} -) - # uninstall target if(NOT TARGET uninstall) configure_file( diff --git a/components/pango_context/CMakeLists.txt b/components/pango_context/CMakeLists.txt index 02022d8c2..dbca54dfa 100644 --- a/components/pango_context/CMakeLists.txt +++ b/components/pango_context/CMakeLists.txt @@ -29,7 +29,6 @@ if(BUILD_TESTS) catch_discover_tests(layer_group_test) endif() -find_package(Sophus REQUIRED) target_link_libraries(${COMPONENT} PUBLIC pango_windowing pango_render pango_vars Sophus::sophus_image Sophus::sophus_sensor) target_link_libraries(${COMPONENT} PUBLIC pango_opengl) diff --git a/components/pango_core/CMakeLists.txt b/components/pango_core/CMakeLists.txt index f167e5136..dc5771f97 100644 --- a/components/pango_core/CMakeLists.txt +++ b/components/pango_core/CMakeLists.txt @@ -45,7 +45,6 @@ install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include" DESTINATION ${CMAKE_INSTALL_PREFIX} ) -find_package(Sophus REQUIRED) target_link_libraries(${COMPONENT} PUBLIC Sophus::sophus third_party) find_package(Threads QUIET) diff --git a/components/pango_image/CMakeLists.txt b/components/pango_image/CMakeLists.txt index 3d86fd1b9..aff216a7b 100644 --- a/components/pango_image/CMakeLists.txt +++ b/components/pango_image/CMakeLists.txt @@ -3,7 +3,6 @@ get_filename_component(COMPONENT ${CMAKE_CURRENT_LIST_DIR} NAME) find_package (Eigen3 REQUIRED QUIET) target_compile_definitions(${COMPONENT} PUBLIC HAVE_EIGEN) -find_package(Sophus REQUIRED) target_link_libraries(${COMPONENT} PUBLIC Sophus::sophus_image) option(BUILD_PANGOLIN_LIBPNG "Build support for libpng image input" ON) diff --git a/components/pango_render/CMakeLists.txt b/components/pango_render/CMakeLists.txt index fc8b848d1..b3770bf08 100644 --- a/components/pango_render/CMakeLists.txt +++ b/components/pango_render/CMakeLists.txt @@ -16,7 +16,6 @@ foreach(basename ${component_file_basenames}) endif() endforeach() -find_package(Sophus REQUIRED) target_link_libraries(${COMPONENT} PUBLIC pango_core Sophus::sophus_image Sophus::sophus_sensor) target_include_directories(${COMPONENT} PUBLIC