| diff -urN parmetis-4.0.3.orig/CMakeLists.txt parmetis-4.0.3/CMakeLists.txt |
| --- parmetis-4.0.3.orig/CMakeLists.txt 2013-03-30 08:24:50.000000000 -0700 |
| +++ parmetis-4.0.3/CMakeLists.txt 2019-11-12 01:46:27.177627800 -0800 |
| @@ -1,12 +1,18 @@ |
| cmake_minimum_required(VERSION 2.8) |
| project(ParMETIS) |
| |
| -set(GKLIB_PATH METIS/GKlib CACHE PATH "path to GKlib") |
| -set(METIS_PATH METIS CACHE PATH "path to METIS") |
| +include(FindPkgConfig) |
| +pkg_check_modules(METIS metis) |
| +if(NOT METIS_FOUND) |
| + message(FATAL_ERROR "metis is not found") |
| +endif() |
| + |
| +set(GKLIB_PATH "${CMAKE_SOURCE_DIR}/metis/GKlib" CACHE PATH "path to GKlib") |
| +#set(METIS_PATH METIS CACHE PATH "path to METIS") |
| |
| # Symlink ./metis to wherever metis is. This allows files to be |
| # included from metis/libmetis/. |
| -execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${METIS_PATH} metis) |
| +#execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${METIS_PATH} metis) |
| |
| # Search for MPI. |
| # GK commented this out as it seems to be creating problems |
| @@ -30,10 +36,11 @@ |
| include_directories(include) |
| include_directories(${MPI_INCLUDE_PATH}) |
| include_directories(${GKLIB_PATH}) |
| -include_directories(${METIS_PATH}/include) |
| +#include_directories(${METIS_PATH}/include) |
| +include_directories(${METIS_INCLUDE_DIRS}) |
| |
| # List of directories that cmake will look for CMakeLists.txt |
| -add_subdirectory(${METIS_PATH}/libmetis ${CMAKE_BINARY_DIR}/libmetis) |
| +#add_subdirectory(${METIS_PATH}/libmetis ${CMAKE_BINARY_DIR}/libmetis) |
| add_subdirectory(include) |
| add_subdirectory(libparmetis) |
| add_subdirectory(programs) |
| diff -urN parmetis-4.0.3.orig/libparmetis/CMakeLists.txt parmetis-4.0.3/libparmetis/CMakeLists.txt |
| --- parmetis-4.0.3.orig/libparmetis/CMakeLists.txt 2013-03-30 08:24:50.000000000 -0700 |
| +++ parmetis-4.0.3/libparmetis/CMakeLists.txt 2019-11-12 01:37:03.599001000 -0800 |
| @@ -5,7 +5,7 @@ |
| # Create libparmetis |
| add_library(parmetis ${ParMETIS_LIBRARY_TYPE} ${parmetis_sources}) |
| # Link with metis and MPI libraries. |
| -target_link_libraries(parmetis metis ${MPI_LIBRARIES}) |
| +target_link_libraries(parmetis ${METIS_LINK_LIBRARIES} ${MPI_LIBRARIES}) |
| set_target_properties(parmetis PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}") |
| |
| install(TARGETS parmetis |
| diff -urN parmetis-4.0.3.orig/metis/GKlib/CMakeLists.txt parmetis-4.0.3/metis/GKlib/CMakeLists.txt |
| --- parmetis-4.0.3.orig/metis/GKlib/CMakeLists.txt 2013-03-30 08:24:50.000000000 -0700 |
| +++ parmetis-4.0.3/metis/GKlib/CMakeLists.txt 2019-11-12 01:45:02.052483700 -0800 |
| @@ -1,9 +1,7 @@ |
| cmake_minimum_required(VERSION 2.8) |
| project(GKlib) |
| |
| -get_filename_component(abs "." ABSOLUTE) |
| -set(GKLIB_PATH ${abs}) |
| -unset(abs) |
| +set(GKLIB_PATH "${CMAKE_SOURCE_DIR}/metis/GKlib" CACHE PATH "path to GKlib") |
| include(GKlibSystem.cmake) |
| |
| include_directories(".") |
