From 0a6e9c8bf676a12ef9a6dad0c8b67eb2b10e5eff Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Fri, 14 Jul 2017 17:41:13 -0600
Subject: [PATCH 1/3] added ENABLE_ALL option

---
 cmake/CMakeLists.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 7fc2304a4c..5cff0f0a54 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -40,9 +40,10 @@ find_package(UnixCommands)
 
 option(CMAKE_VERBOSE_MAKEFILE "Verbose makefile" OFF)
 
+option(ENABLE_ALL "Build all packages" OFF)
 set(PACKAGES ASPHERE BODY COLLOID CLASS2 COMPRESS CORESHELL DIPOLE GRANULAR KSPACE MC MOLECULE MANYBODY RIGID REAX)
 foreach(PKG ${PACKAGES})
-  option(ENABLE_${PKG} "Build ${PKG} Package" OFF)
+  option(ENABLE_${PKG} "Build ${PKG} Package" ${ENABLE_ALL})
 endforeach()
 
 set(ACCEL_PACKAGES USER-OMP)
@@ -169,3 +170,9 @@ install(TARGETS lammps LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTI
 add_executable(lmp ${LMP_SOURCES})
 target_link_libraries(lmp lammps)
 install(TARGETS lammps DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+foreach(PKG ${PACKAGES} ${ACCEL_PACKAGES})
+  if(ENABLE_${PKG})
+    message(STATUS "Building package: ${PKG}")
+  endif()
+endforeach()

From 54f2b02ac813f5931a8e4118395ccc86078d583b Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Fri, 14 Jul 2017 18:33:27 -0600
Subject: [PATCH 2/3] cmake: fix install

---
 cmake/CMakeLists.txt                 | 10 ++++++++--
 cmake/Modules/StyleHeaderUtils.cmake |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 5cff0f0a54..96d1595f6b 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -26,6 +26,7 @@ include(CheckCCompilerFlag)
 # User input options                                                   #
 ########################################################################
 option(BUILD_SHARED_LIBS "Build shared libs" OFF)
+option(INSTALL_LIB "Install lammps library and header" ON)
 include(GNUInstallDirs)
 
 set(LAMMPS_LINK_LIBS)
@@ -165,11 +166,16 @@ include_directories(${LAMMPS_STYLE_HEADERS_DIR})
 add_library(lammps ${LIB_SOURCES})
 target_link_libraries(lammps ${LAMMPS_LINK_LIBS})
 set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION})
-install(TARGETS lammps LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+if(INSTALL_LIB)
+  install(TARGETS lammps LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  install(FILES ${LAMMPS_SOURCE_DIR}/lammps.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+elseif(NOT BUILD_SHARED_LIBS)
+  message(FATAL_ERROR "Shared library has to install, use -DBUILD_SHARED_LIBS=OFF to install lammps with a a library")
+endif()
 
 add_executable(lmp ${LMP_SOURCES})
 target_link_libraries(lmp lammps)
-install(TARGETS lammps DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(TARGETS lmp DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 foreach(PKG ${PACKAGES} ${ACCEL_PACKAGES})
   if(ENABLE_${PKG})
diff --git a/cmake/Modules/StyleHeaderUtils.cmake b/cmake/Modules/StyleHeaderUtils.cmake
index 2ee9496671..bbb93e6145 100644
--- a/cmake/Modules/StyleHeaderUtils.cmake
+++ b/cmake/Modules/StyleHeaderUtils.cmake
@@ -24,7 +24,7 @@ function(CreateStyleHeader path filename)
             set(temp "${temp}#include \"${FNAME}\"\n")
         endforeach()
     endif()
-    message("Generating ${filename}...")
+    message(STATUS "Generating ${filename}...")
     file(WRITE "${path}/${filename}" "${temp}" )
 endfunction(CreateStyleHeader)
 

From d079b2f758fe1a0235897d9f74376fda07a8ed69 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Fri, 14 Jul 2017 18:37:06 -0600
Subject: [PATCH 3/3] CreateStyleHeader: use temp file

---
 cmake/Modules/StyleHeaderUtils.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/Modules/StyleHeaderUtils.cmake b/cmake/Modules/StyleHeaderUtils.cmake
index bbb93e6145..b0b9bd9418 100644
--- a/cmake/Modules/StyleHeaderUtils.cmake
+++ b/cmake/Modules/StyleHeaderUtils.cmake
@@ -25,7 +25,8 @@ function(CreateStyleHeader path filename)
         endforeach()
     endif()
     message(STATUS "Generating ${filename}...")
-    file(WRITE "${path}/${filename}" "${temp}" )
+    file(WRITE "${path}/${filename}.tmp" "${temp}" )
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${path}/${filename}.tmp" "${path}/${filename}")
 endfunction(CreateStyleHeader)
 
 function(GenerateStyleHeader path property style)