From cceb874fba62ab06dcbfe0c9f5f130374c85fa52 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sat, 29 Jan 2011 16:24:46 -0800 Subject: [PATCH] Bugfixes for Ignacio. INSTALL now correctly includes the path to source on the cmake command line. Added Timer.h and timing.h to the install, as they're needed by par_kmedoids.h. --- INSTALL | 6 ++++-- src/CMakeLists.txt | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index 1684806..5d4e928 100644 --- a/INSTALL +++ b/INSTALL @@ -12,7 +12,7 @@ Once this is done, you can build and install Muster like this: $ tar xzf muster.tar.gz $ cd muster $ mkdir linux-x86_64 && cd linux-x86_64 - $ cmake -D CMAKE_INSTALL_PREFIX=/path/to/install/location + $ cmake -D CMAKE_INSTALL_PREFIX=/path/to/install/location .. $ make $ make install @@ -35,7 +35,9 @@ can do this with the ccmake interactive tool: $ ccmake .. Hit 't' to toggle advanced options, and you will be able to edit the -particular variables used to guide the MPI build. +particular variables used to guide the MPI build. Note that you can +also pass any of the MPI variables to cmake on the command line with +-D VARIABLE=value. ------------------------------------------------------------------------------ External Dependencies diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c4802ad..558c86d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,7 +24,9 @@ if (MUSTER_HAVE_MPI) par_kmedoids.h multi_gather.h trial.h - id_pair.h) + id_pair.h + ../external/Timer.h + ../external/timing.h) endif() add_library(muster ${MUSTER_SOURCES})