72 lines
2.1 KiB
Diff
72 lines
2.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index ca945dd..aff8b5f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -23,7 +23,7 @@ else()
|
|
set(ParMETIS_LIBRARY_TYPE STATIC)
|
|
endif()
|
|
|
|
-include(${GKLIB_PATH}/GKlibSystem.cmake)
|
|
+include_directories(${GKLIB_PATH})
|
|
|
|
# List of paths that the compiler will search for header files.
|
|
# i.e., the -I equivalent
|
|
@@ -33,7 +33,7 @@ include_directories(${GKLIB_PATH})
|
|
include_directories(${METIS_PATH}/include)
|
|
|
|
# List of directories that cmake will look for CMakeLists.txt
|
|
-add_subdirectory(${METIS_PATH}/libmetis ${CMAKE_BINARY_DIR}/libmetis)
|
|
+find_library(METIS_LIBRARY metis PATHS ${METIS_PATH}/lib)
|
|
add_subdirectory(include)
|
|
add_subdirectory(libparmetis)
|
|
add_subdirectory(programs)
|
|
diff --git a/libparmetis/CMakeLists.txt b/libparmetis/CMakeLists.txt
|
|
index 9cfc8a7..e0c4de7 100644
|
|
--- a/libparmetis/CMakeLists.txt
|
|
+++ b/libparmetis/CMakeLists.txt
|
|
@@ -5,7 +5,10 @@ file(GLOB parmetis_sources *.c)
|
|
# 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_LIBRARY} ${MPI_LIBRARIES})
|
|
+if(UNIX)
|
|
+ target_link_libraries(parmetis m)
|
|
+endif()
|
|
set_target_properties(parmetis PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
|
|
|
|
install(TARGETS parmetis
|
|
diff --git a/libparmetis/parmetislib.h b/libparmetis/parmetislib.h
|
|
index c1daeeb..07511f6 100644
|
|
--- a/libparmetis/parmetislib.h
|
|
+++ b/libparmetis/parmetislib.h
|
|
@@ -20,13 +20,12 @@
|
|
|
|
#include <parmetis.h>
|
|
|
|
-#include "../metis/libmetis/gklib_defs.h"
|
|
+#include <gklib_defs.h>
|
|
|
|
-#include <mpi.h>
|
|
+#include <mpi.h>
|
|
|
|
#include <rename.h>
|
|
#include <defs.h>
|
|
#include <struct.h>
|
|
#include <macros.h>
|
|
#include <proto.h>
|
|
-
|
|
diff --git a/programs/parmetisbin.h b/programs/parmetisbin.h
|
|
index e26cd2d..d156480 100644
|
|
--- a/programs/parmetisbin.h
|
|
+++ b/programs/parmetisbin.h
|
|
@@ -19,7 +19,7 @@
|
|
#include <GKlib.h>
|
|
#include <parmetis.h>
|
|
|
|
-#include "../metis/libmetis/gklib_defs.h"
|
|
+#include <gklib_defs.h>
|
|
#include "../libparmetis/rename.h"
|
|
#include "../libparmetis/defs.h"
|
|
#include "../libparmetis/struct.h"
|