Commit dcdc7877 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

make compile time output more consistent and complete

parent 2f11f2d7

cmake/CMakeLists.txt

+3 −2
Original line number Diff line number Diff line
@@ -801,13 +801,14 @@ include_directories(${LAMMPS_STYLE_HEADERS_DIR}) 
######################################

# Generate lmpinstalledpkgs.h

######################################

set(temp "const char * LAMMPS_NS::LAMMPS::installed_packages[] =  {\n")

set(temp "#ifndef LMP_INSTALLED_PKGS_H\n#define LMP_INSTALLED_PKGS_H\n")

set(temp "${temp}const char * LAMMPS_NS::LAMMPS::installed_packages[] =  {\n")

foreach(PKG ${DEFAULT_PACKAGES} ${ACCEL_PACKAGES} ${OTHER_PACKAGES})

    if(PKG_${PKG})

        set(temp "${temp}  \"${PKG}\",\n")

    endif()

endforeach()

set(temp "${temp}  NULL\n};\n\n")

set(temp "${temp}  NULL\n};\n#endif\n\n")

message(STATUS "Generating lmpinstalledpkgs.h...")

file(WRITE "${LAMMPS_STYLE_HEADERS_DIR}/lmpinstalledpkgs.h.tmp" "${temp}" )

execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${LAMMPS_STYLE_HEADERS_DIR}/lmpinstalledpkgs.h.tmp" "${LAMMPS_STYLE_HEADERS_DIR}/lmpinstalledpkgs.h")

src/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ help: 


lmpinstalledpkgs.h: $(SRC) $(INC)

	@echo 'Gathering installed package information (may take a little while)'

	@echo '#ifndef LMP_INSTALLED_PKGS' >  lmpinstalledpkgs.tmp

	@echo '#define LMP_INSTALLED_PKGS' >> lmpinstalledpkgs.tmp

	@echo '#ifndef LMP_INSTALLED_PKGS_H' >  lmpinstalledpkgs.tmp

	@echo '#define LMP_INSTALLED_PKGS_H' >> lmpinstalledpkgs.tmp

	@echo 'const char * LAMMPS_NS::LAMMPS::installed_packages[] = {' >> lmpinstalledpkgs.tmp

	@for p in $(PACKAGEUC) $(PACKUSERUC); do info=$$($(SHELL) Package.sh $$p installed); \

             [ -n "$$info" ] && echo "\"$$info\"" | sed -e 's/".*package \(.*\)"/"\1",/' >> lmpinstalledpkgs.tmp || :; done

src/lammps.cpp

+1 −0
Original line number Diff line number Diff line
@@ -990,6 +990,7 @@ void LAMMPS::print_config(FILE *fp) 
  if (Info::has_png_support()) fputs("-DLAMMPS_PNG\n",fp);

  if (Info::has_jpeg_support()) fputs("-DLAMMPS_JPEG\n",fp);

  if (Info::has_ffmpeg_support()) fputs("-DLAMMPS_FFMPEG\n",fp);

  if (Info::has_exceptions()) fputs("-DLAMMPS_EXCEPTIONS\n",fp);



  fputs("\nInstalled packages:\n\n",fp);

  for (int i = 0; NULL != (pkg = installed_packages[i]); ++i) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE