--- CMakeLists.txt.orig	2017-11-30 09:34:53 UTC
+++ CMakeLists.txt
@@ -47,9 +47,9 @@ ENDIF()
 ADD_LIBRARY(liggghts_obj OBJECT ${SOURCES})
 ADD_DEPENDENCIES(liggghts_obj GenerateHeaders)
 
-ADD_LIBRARY(liggghts_static STATIC $<TARGET_OBJECTS:liggghts_obj>)
-SET_TARGET_PROPERTIES(liggghts_static PROPERTIES OUTPUT_NAME liggghts)
-SET_PROPERTY(TARGET liggghts_static PROPERTY PUBLIC_HEADER ${HEADERS})
+#ADD_LIBRARY(liggghts_static STATIC $<TARGET_OBJECTS:liggghts_obj>)
+#SET_TARGET_PROPERTIES(liggghts_static PROPERTIES OUTPUT_NAME liggghts)
+#SET_PROPERTY(TARGET liggghts_static PROPERTY PUBLIC_HEADER ${HEADERS})
 
 ADD_LIBRARY(liggghts_shared SHARED $<TARGET_OBJECTS:liggghts_obj>)
 SET_TARGET_PROPERTIES(liggghts_shared PROPERTIES OUTPUT_NAME liggghts)
@@ -67,7 +67,7 @@ FIND_PACKAGE(VTK NO_MODULE)
 IF(VTK_FOUND)
   INCLUDE(${VTK_USE_FILE})
   ADD_DEFINITIONS(-DLAMMPS_VTK)
-  TARGET_LINK_LIBRARIES(liggghts_static ${VTK_LIBRARIES})
+  #TARGET_LINK_LIBRARIES(liggghts_static ${VTK_LIBRARIES})
   TARGET_LINK_LIBRARIES(liggghts_shared ${VTK_LIBRARIES})
   TARGET_LINK_LIBRARIES(liggghts_bin ${VTK_LIBRARIES})
   MESSAGE(STATUS "Found VTK")
@@ -82,7 +82,7 @@ FIND_PACKAGE(JPEG)
 IF(JPEG_FOUND)
   INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
   ADD_DEFINITIONS(-DLAMMPS_JPEG)
-  TARGET_LINK_LIBRARIES(liggghts_static jpeg)
+  #TARGET_LINK_LIBRARIES(liggghts_static jpeg)
   TARGET_LINK_LIBRARIES(liggghts_shared jpeg)
   TARGET_LINK_LIBRARIES(liggghts_bin jpeg)
 ELSE(JPEG_FOUND)
@@ -95,25 +95,25 @@ FIND_PACKAGE(MPI)
 
 IF(MPI_FOUND)
   INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
-  TARGET_LINK_LIBRARIES(liggghts_static ${MPI_LIBRARIES})
+  #TARGET_LINK_LIBRARIES(liggghts_static ${MPI_LIBRARIES})
   TARGET_LINK_LIBRARIES(liggghts_shared ${MPI_LIBRARIES})
   TARGET_LINK_LIBRARIES(liggghts_bin ${MPI_LIBRARIES})
 
   IF(MPI_COMPILE_FLAGS)
-    SET_TARGET_PROPERTIES(liggghts_static PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}")
+    #SET_TARGET_PROPERTIES(liggghts_static PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}")
     SET_TARGET_PROPERTIES(liggghts_shared PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}")
     SET_TARGET_PROPERTIES(liggghts_bin PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}")
   ENDIF()
 
   IF(MPI_LINK_FLAGS)
-    SET_TARGET_PROPERTIES(liggghts_static PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
+    #SET_TARGET_PROPERTIES(liggghts_static PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
     SET_TARGET_PROPERTIES(liggghts_shared PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
     SET_TARGET_PROPERTIES(liggghts_bin PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
   ENDIF()
 ELSE(MPI_FOUND)
   MESSAGE(STATUS "MPI NOT found! Using MPI Stubs instead.")
   ADD_SUBDIRECTORY(STUBS)
-  TARGET_LINK_LIBRARIES(liggghts_static mpi_stubs)
+  #TARGET_LINK_LIBRARIES(liggghts_static mpi_stubs)
   TARGET_LINK_LIBRARIES(liggghts_shared mpi_stubs)
   TARGET_LINK_LIBRARIES(liggghts_bin mpi_stubs)
 ENDIF(MPI_FOUND)
@@ -128,11 +128,11 @@ ENDIF(MPI_FOUND)
 #        RUNTIME DESTINATION bin
 #        LIBRARY DESTINATION lib)
 
-install(TARGETS liggghts_bin liggghts_static liggghts_shared
+install(TARGETS liggghts_bin liggghts_shared
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION lib
         ARCHIVE DESTINATION lib
-        PUBLIC_HEADER DESTINATION include)
+        PUBLIC_HEADER DESTINATION include/liggghts)
 IF (WIN32)
     install(DIRECTORY WINDOWS DESTINATION include)
 ENDIF()