From 2b1985f755fb5019f03d4e76b6174808e7f543c1 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Tue, 10 Oct 2023 11:36:49 -0400 Subject: [PATCH] restore GNU make build capability for ML-PACE --- lib/pace/Makefile | 6 +++--- lib/pace/Makefile.lammps | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/pace/Makefile b/lib/pace/Makefile index 5a1588ef93..37f00ee70e 100644 --- a/lib/pace/Makefile +++ b/lib/pace/Makefile @@ -1,4 +1,5 @@ SHELL = /bin/sh +CMAKE= cmake # ------ FILES ------ @@ -35,7 +36,7 @@ lib: $(OBJ) lib-yaml-cpp lib-yaml-cpp: - cd $(YAML_CPP_PATH) && $(MAKE) lib + cd $(YAML_CPP_PATH) && $(CMAKE) . && $(MAKE) all # ------ COMPILE RULES ------ @@ -45,9 +46,8 @@ lib-yaml-cpp: # ------ CLEAN ------ clean-all: -rm -f *~ $(OBJ) $(LIB) - cd $(YAML_CPP_PATH) && $(MAKE) clean-all + cd $(YAML_CPP_PATH) && $(MAKE) clean clean-build: -rm -f *~ $(OBJ) - cd $(YAML_CPP_PATH) && $(MAKE) clean-build diff --git a/lib/pace/Makefile.lammps b/lib/pace/Makefile.lammps index 6411e49a07..1c549e31d0 100644 --- a/lib/pace/Makefile.lammps +++ b/lib/pace/Makefile.lammps @@ -1,3 +1,3 @@ pace_SYSINC =-I../../lib/pace/src/ML-PACE -I../../lib/pace/src/yaml-cpp/include -I../../lib/pace/src/wigner-cpp/include -DEXTRA_C_PROJECTIONS -pace_SYSLIB = -L../../lib/pace/ -lpace -L../../lib/pace/src/yaml-cpp/ -lyaml-cpp +pace_SYSLIB = -L../../lib/pace/ -lpace -L../../lib/pace/src/yaml-cpp/ -lyaml-cpp-pace pace_SYSPATH =