Commit 71c599d3 authored by Thomas Steinreiter's avatar Thomas Steinreiter
Browse files

fixed CMakeLists for using Boost, added note to Readme.

parent 9f3ee7c6
......@@ -2,7 +2,7 @@
cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR)
find_package(MPI) # Built-in in CMake
find_package(Boost 1.55 COMPONENTS program_options mpi serialization REQUIRED)
find_package(Boost 1.55 COMPONENTS program_options REQUIRED)
include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/common.cmake)
......@@ -16,7 +16,7 @@ set(NAME ${DWARF_PREFIX}_wireworld)
if (MPI_FOUND AND Boost_FOUND)
enable_language(CXX)
include_directories(${MPI_INCLUDE_PATH})
include_directories(${MPI_INCLUDE_PATH} ${Boost_INCLUDE_DIRS})
add_executable(${NAME} main.cpp Configuration.cpp Communicator.cpp FileIO.cpp MpiEnvironment.cpp MpiSubarray.cpp MpiWireworld.cpp Tile.cpp Util.cpp)
set(CMAKE_BUILD_TYPE RelWithDebInfo)
add_definitions(-DGSL_UNENFORCED_ON_CONTRACT_VIOLATION)
......
......@@ -29,7 +29,7 @@ The code sample is structured as follows:
File Format:
The Wireworld file format is a text format. The first line is the header. The header has 2 positive integers, separated by space, which define the number of *colums*(width) and the number of *rows*(height).
The Wireworld file format is a text format. The first line is the header. The header has 2 positive integers, separated by space, which define the number of *colums*(width) and the number of *rows*(height) of the Wireworld.
In the following lines, the wireworld data is provided.
Each line is a row.
There are exactly *rows* lines and each line is exactly *colums* long.
......@@ -95,7 +95,7 @@ either on the command line or in your batch script, where `g` specifies the numb
`-c [ --gridcols ]`: number of columns in the grid to form the tiles (optional, automatically deduced)
`-g [ --generations ]`: number of generations simulated (default 1000)
`-m [ --commmode ]`: Communication Mode. Collective or P2P (default Collective)
`-f [ --inputfile ]`: path to wireworld input file (mandatory, flag can be obmitted)
`-f [ --inputfile ]`: path to wireworld input file (mandatory, flag can be obmitted) The file dimension must be divisible by the grid dimension.
`-o [ --outputfile ]`: path to wireworld input file (optional, no writing)
### Example
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment