Commit 9b623c73 authored by Kirill Terekhov's avatar Kirill Terekhov

Updates

Removed option to compile projects.
Added MPI libraries and flags to be exported for cmake.
parent 0722d266
......@@ -57,7 +57,7 @@ option(USE_PARTITIONER "Compile partitioner capabilities" ON)
option(USE_AUTODIFF "Compile automatic differentiation capabilities" ON)
option(TEST_FORTRAN_ANI3D "Test for fortran availibility to compile ANI3D lib" OFF)
option(COMPILE_EXAMPLES "Compile examples" OFF)
option(COMPILE_PROJECTS "Compile projects" OFF)
#option(COMPILE_PROJECTS "Compile projects" OFF)
option(COMPILE_TESTS "Compile some tests" OFF)
option(USE_PARTITIONER_PARMETIS "Use ParMetis partitioner" OFF)
......@@ -227,9 +227,9 @@ if(COMPILE_EXAMPLES)
add_subdirectory(examples)
endif(COMPILE_EXAMPLES)
if(COMPILE_PROJECTS)
add_subdirectory(projects)
endif(COMPILE_PROJECTS)
#if(COMPILE_PROJECTS)
#add_subdirectory(projects)
#endif(COMPILE_PROJECTS)
if(COMPILE_TESTS)
enable_testing()
......
......@@ -4,6 +4,7 @@
# INMOST_LIBRARY_DIRS - library directories for INMOST and dependencies
# INMOST_LIBRARIES - libraries to link against
# INMOST_COMPILE_FLAGS - flags to set to compiler (generally inherited from MPI)
# INMOST_LINK_FLAGS - flags to set to linker (generally inherited from MPI)
# Compute paths
get_filename_component(inmost_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
......@@ -32,6 +33,8 @@ set(USE_SOLVER_PETSC @USE_SOLVER_PETSC@)
if( USE_MPI )
list(APPEND INMOST_INCLUDE_DIRS "@MPI_INCLUDE_PATH@")
list(APPEND INMOST_COMPILE_FLAGS "@MPI_COMPILE_FLAGS@")
list(APPEND INMOST_LIBRARIES "@MPI_LIBRARIES@")
list(APPEND INMOST_LINK_FLAGS "@MPI_LINK_FLAGS@")
endif( USE_MPI )
if( USE_PARTITIONER_ZOLTAN )
......@@ -66,4 +69,4 @@ if( USE_SOLVER_PETSC )
list(APPEND INMOST_LIBRARIES "@PETSC_LIBRARIES@")
list(APPEND INMOST_LIBRARY_DIRS "@PETSC_LIBRARY_DIRS@")
list(APPEND INMOST_INCLUDE_DIRS "@PETSC_INCLUDES@")
endif( USE_SOLVER_PETSC )
\ No newline at end of file
endif( USE_SOLVER_PETSC )
Markdown is supported
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