12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename libmetis -> libmetis-gtsam to avoid collision with system libs

release/4.3a0
Bernd Pfrommer 2020-06-01 16:20:56 -04:00
parent 106cab5b53
commit 5801ab079d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtsam/3rdparty/metis/libmetis/CMakeLists.txt vendored
View File

@ -4,26 +4,26 @@ include_directories(.)
file(GLOB metis_sources *.c) file(GLOB metis_sources *.c)
# Build libmetis. # Build libmetis.
add_definitions(-fPIC) 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) if(UNIX)
target_link_libraries(metis m) target_link_libraries(metis-gtsam m)
endif() endif()
if(WIN32) if(WIN32)
set_target_properties(metis PROPERTIES set_target_properties(metis-gtsam PROPERTIES
PREFIX "" PREFIX ""
RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/../../../bin") RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/../../../bin")
endif() endif()
if (APPLE) if (APPLE)
set_target_properties(metis PROPERTIES set_target_properties(metis-gtsam PROPERTIES
INSTALL_NAME_DIR INSTALL_NAME_DIR
"${CMAKE_INSTALL_PREFIX}/lib") "${CMAKE_INSTALL_PREFIX}/lib")
endif() endif()
install(TARGETS metis EXPORT GTSAM-exports install(TARGETS metis-gtsam EXPORT GTSAM-exports
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 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) set(GTSAM_EXPORTED_TARGETS "${GTSAM_EXPORTED_TARGETS}" PARENT_SCOPE)

2
gtsam/CMakeLists.txt
View File

@ -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) install(FILES "${PROJECT_BINARY_DIR}/config.h" "${PROJECT_BINARY_DIR}/dllexport.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam)
if(GTSAM_SUPPORT_NESTED_DISSECTION) if(GTSAM_SUPPORT_NESTED_DISSECTION)
list(APPEND GTSAM_ADDITIONAL_LIBRARIES metis) list(APPEND GTSAM_ADDITIONAL_LIBRARIES metis-gtsam)
endif() endif()
# Versions # Versions

2
gtsam_unstable/partition/tests/CMakeLists.txt
View File

@ -1,2 +1,2 @@
set(ignore_test "testNestedDissection.cpp") 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")