diff options
author | Gard Spreemann <gard.spreemann@epfl.ch> | 2017-09-27 09:45:17 +0200 |
---|---|---|
committer | Gard Spreemann <gard.spreemann@epfl.ch> | 2017-09-27 09:45:17 +0200 |
commit | cb62c39b65047c51b8ea8233bfc7bf4a3f7c7998 (patch) | |
tree | ba22d3cbd3fd48d38611899af0d11794f9728f38 | |
parent | a4dbcb81c26ba8c265ef78c653236fe366719e13 (diff) |
Exchange hard-coded PETSc and SLEPc paths for user-set ones.
-rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index aebfacf..9be4306 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,29 +2,27 @@ cmake_minimum_required(VERSION 2.8.8) project(lapdog) -#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/") - find_package(MPI REQUIRED) include_directories(${MPI_INCLUDE_PATH}) link_directories(${MPI_LIBRARIES}) -# Hard-coded for now -set(PETSC_INCLUDE_PATH "/usr/lib/petscdir/3.7/include") -set(PETSC_LIBRARY_PATH "/usr/lib/petscdir/3.7/lib") +if(PETSC_INCLUDE_PATH) + include_directories(${PETSC_INCLUDE_PATH}) +endif() +if(PETSC_LIBRARY_PATH) + link_directories(${PETSC_LIBRARY_PATH}) +endif() set(PETSC_LIBRARIES "petsc") -include_directories(${PETSC_INCLUDE_PATH}) -link_directories(${PETSC_LIBRARY_PATH}) -set(SLEPC_INCLUDE_PATH "/usr/lib/slepcdir/3.7/include") -set(SLEPC_LIBRARY_PATH "/usr/lib/slepcdir/3.7/lib") +if(SLEPC_INCLUDE_PATH) + include_directories(${SLEPC_INCLUDE_PATH}) +endif() +if(SLEPC_LIBRARY_PATH) + link_directories(${SLEPC_LIBRARY_PATH}) +endif() set(SLEPC_LIBRARIES "slepc") -include_directories(${SLEPC_INCLUDE_PATH}) -link_directories(${SLEPC_LIBRARY_PATH}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MPI_COMPILE_FLAGS} -Wall -pedantic -Wextra -std=c++14") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MPI_LINK_FLAGS}") -#find_package(PETSc REQUIRED) - - add_subdirectory(src) |