Blob Blame History Raw
--- CMakeLists.orig.txt	2018-04-29 20:01:10.000000000 +0200
+++ CMakeLists.txt	2019-02-12 20:05:48.244619210 +0100
@@ -58,7 +58,7 @@
 #      modifications to CombBLAS and have the changes automatically recompiled for
 #      dependent projects.
 # Either way, we need to create a CombBLASConfig.cmake.
-set(ConfigPackageLocation lib/cmake/CombBLAS)
+set(ConfigPackageLocation ${MPI_LIB}/cmake/CombBLAS)
 
 # Generate version number header
 include(GenerateExportHeader)
@@ -66,13 +66,13 @@
 set_property(TARGET CombBLAS PROPERTY VERSION ${CombBLAS_VERSION})
 
 # installation
-install(DIRECTORY include/ DESTINATION include)
-install(DIRECTORY psort-1.0/include/ DESTINATION include)
+install(DIRECTORY include/ DESTINATION ${MPI_INCLUDE})
+install(DIRECTORY psort-1.0/include/ DESTINATION ${MPI_INCLUDE})
 install(TARGETS CombBLAS EXPORT CombBLASTargets
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include
+  LIBRARY DESTINATION ${MPI_LIB}
+  ARCHIVE DESTINATION ${MPI_LIB}
+  RUNTIME DESTINATION ${MPI_BIN}
+  INCLUDES DESTINATION ${MPI_INCLUDE}
 )
 
 include(CMakePackageConfigHelpers)
--- usort/CMakeLists.orig.txt	2018-04-29 20:01:10.000000000 +0200
+++ usort/CMakeLists.txt	2019-02-12 20:49:48.356466740 +0100
@@ -4,11 +4,11 @@
 target_include_directories(Usortlib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
 target_include_directories(Usortlib PRIVATE include/usort)
 
-install(DIRECTORY include/ DESTINATION include)
+install(DIRECTORY include/ DESTINATION ${MPI_INCLUDE})
 install(TARGETS Usortlib EXPORT CombBLASTargets
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include
+  LIBRARY DESTINATION ${MPI_LIB}
+  ARCHIVE DESTINATION ${MPI_LIB}
+  RUNTIME DESTINATION ${MPI_BIN}
+  INCLUDES DESTINATION ${MPI_INCLUDE}
 )
 
--- graph500-1.2/generator/CMakeLists.orig.txt	2018-04-29 20:01:10.000000000 +0200
+++ graph500-1.2/generator/CMakeLists.txt	2019-02-12 21:15:40.864864737 +0100
@@ -7,10 +7,10 @@
   target_compile_options(GraphGenlib PRIVATE "-restrict")
 endif()
 
-install(DIRECTORY include/ DESTINATION include)
+install(DIRECTORY include/ DESTINATION ${MPI_INCLUDE})
 install(TARGETS GraphGenlib EXPORT CombBLASTargets
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include
+  LIBRARY DESTINATION ${MPI_LIB}
+  ARCHIVE DESTINATION ${MPI_LIB}
+  RUNTIME DESTINATION ${MPI_BIN}
+  INCLUDES DESTINATION ${MPI_INCLUDE}
 )