From 591212af3ac3a6c0d5f9fce59199b39b279929e8 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Sun, 22 Mar 2020 19:57:48 -0600
Subject: [PATCH] cmake: add back include path for now

---
 cmake/CMakeLists.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index b9e8d5b919..c6d149e7d6 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -112,15 +112,17 @@ if(BUILD_LIB)
   add_library(lammps ${ALL_SOURCES})
   if(BUILD_EXE)
     add_executable(lmp ${MAIN_SOURCES})
-    set(LAMMPS_EXE lmp)
     target_link_libraries(lmp PRIVATE lammps)
+    set_target_properties(lmp PROPERTIES OUTPUT_NAME ${LAMMPS_BINARY})
+    install(TARGETS lmp DESTINATION ${CMAKE_INSTALL_BINDIR})
   endif()
 else()
   if(NOT BUILD_EXE)
     message(FATAL_ERROR "You need to at least enable one of two following options: BUILD_LIB or BUILD_EXE")
   endif()
   add_executable(lammps ${ALL_SOURCES})
-  set(LAMMPS_EXE lammps)
+  set_target_properties(lammps PROPERTIES OUTPUT_NAME ${LAMMPS_BINARY})
+  install(TARGETS lammps DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 option(CMAKE_VERBOSE_MAKEFILE "Generate verbose Makefiles" OFF)
@@ -186,6 +188,7 @@ if(BUILD_MPI)
     include(MPI4WIN)
   else()
     find_package(MPI REQUIRED)
+    include_directories(${MPI_CXX_INCLUDE_PATH})
     add_definitions(-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1)
     target_link_libraries(lammps PRIVATE MPI::MPI_CXX)
     option(LAMMPS_LONGLONG_TO_LONG "Workaround if your system or MPI version does not recognize 'long long' data types" OFF)
@@ -580,8 +583,6 @@ if(BUILD_LIB)
 endif()
 
 if(BUILD_EXE)
-  set_target_properties(${LAMMPS_EXE} PROPERTIES OUTPUT_NAME ${LAMMPS_BINARY})
-  install(TARGETS ${LAMMPS_EXE} DESTINATION ${CMAKE_INSTALL_BINDIR})
   install(FILES ${LAMMPS_DOC_DIR}/lammps.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 RENAME ${LAMMPS_BINARY}.1)
 endif()