- In case of Edison and Cori we should not
  call the find_package(Trilinos) command
  otherwise it uses the wrong
  TRILINNOS_TPL_LIBRARIES (i.e. instead
  of cray-tpsl/16.07.1 [that we need to load]
  it uses cray-tpsl/16.06.1 linked libs).
  This leads obviously to linker problems.
- Fix if-statement bug in src/CMakeLists.txt

modified:   CMakeLists.txt
modified:   src/CMakeLists.txt