From 5801ab079d4830ad52443421021fbba245a0377e Mon Sep 17 00:00:00 2001 From: Bernd Pfrommer Date: Mon, 1 Jun 2020 16:20:56 -0400 Subject: [PATCH] rename libmetis -> libmetis-gtsam to avoid collision with system libs --- gtsam/3rdparty/metis/libmetis/CMakeLists.txt | 12 ++++++------ gtsam/CMakeLists.txt | 2 +- gtsam_unstable/partition/tests/CMakeLists.txt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gtsam/3rdparty/metis/libmetis/CMakeLists.txt b/gtsam/3rdparty/metis/libmetis/CMakeLists.txt index 3d2243388..330e989fa 100644 --- a/gtsam/3rdparty/metis/libmetis/CMakeLists.txt +++ b/gtsam/3rdparty/metis/libmetis/CMakeLists.txt @@ -4,26 +4,26 @@ include_directories(.) file(GLOB metis_sources *.c) # Build libmetis. add_definitions(-fPIC) -add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources}) +add_library(metis-gtsam ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources}) if(UNIX) - target_link_libraries(metis m) + target_link_libraries(metis-gtsam m) endif() if(WIN32) - set_target_properties(metis PROPERTIES + set_target_properties(metis-gtsam PROPERTIES PREFIX "" RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/../../../bin") endif() if (APPLE) - set_target_properties(metis PROPERTIES + set_target_properties(metis-gtsam PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") endif() -install(TARGETS metis EXPORT GTSAM-exports +install(TARGETS metis-gtsam EXPORT GTSAM-exports LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -list(APPEND GTSAM_EXPORTED_TARGETS metis) +list(APPEND GTSAM_EXPORTED_TARGETS metis-gtsam) set(GTSAM_EXPORTED_TARGETS "${GTSAM_EXPORTED_TARGETS}" PARENT_SCOPE) diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt index 20995ce5e..3d1bbd2a7 100644 --- a/gtsam/CMakeLists.txt +++ b/gtsam/CMakeLists.txt @@ -89,7 +89,7 @@ list(APPEND gtsam_srcs "${PROJECT_BINARY_DIR}/config.h" "${PROJECT_BINARY_DIR}/d install(FILES "${PROJECT_BINARY_DIR}/config.h" "${PROJECT_BINARY_DIR}/dllexport.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam) if(GTSAM_SUPPORT_NESTED_DISSECTION) - list(APPEND GTSAM_ADDITIONAL_LIBRARIES metis) + list(APPEND GTSAM_ADDITIONAL_LIBRARIES metis-gtsam) endif() # Versions diff --git a/gtsam_unstable/partition/tests/CMakeLists.txt b/gtsam_unstable/partition/tests/CMakeLists.txt index 2bb95e243..9e74d9996 100644 --- a/gtsam_unstable/partition/tests/CMakeLists.txt +++ b/gtsam_unstable/partition/tests/CMakeLists.txt @@ -1,2 +1,2 @@ set(ignore_test "testNestedDissection.cpp") -gtsamAddTestsGlob(partition "test*.cpp" "${ignore_test}" "gtsam_unstable;gtsam;metis") +gtsamAddTestsGlob(partition "test*.cpp" "${ignore_test}" "gtsam_unstable;gtsam;metis-gtsam")