Remove traces of JSONDIR

Flash-X · Jan 25, 2025 · 30915db · 30915db
1 parent 3984745
commit 30915db
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 6 deletions.
diff --git a/sites/gce/Makefile.site.gnu_mpich b/sites/gce/Makefile.site.gnu_mpich
@@ -21,7 +21,6 @@ else
   AMREXDIR     = $(MILHOJA_TEST_CLONE)/gce/gnu_current/AMReX_$(NDIM)D
 endif
 GTESTDIR     = $(MILHOJA_TEST_CLONE)/gce/gnu_current/googletest
-JSONDIR      = $(MILHOJA_TEST_CLONE)/gce/gnu_current/json/single_include
 CUDADIR      =
 
 CXXCOMPNAME  = gnu

diff --git a/sites/gce/Makefile.site.intel_mpich b/sites/gce/Makefile.site.intel_mpich
@@ -3,7 +3,6 @@
 BASEDIR      = $(MILHOJA_CODE_REPO)
 AMREXDIR     = $(MILHOJA_TEST_CLONE)/gce/intel_current/AMReX_$(NDIM)D
 GTESTDIR     = $(MILHOJA_TEST_CLONE)/gce/intel_current/googletest
-JSONDIR      = $(MILHOJA_TEST_CLONE)/gce/intel_current/json/single_include
 CUDADIR      =
 
 CXXCOMPNAME  = intel

diff --git a/sites/gce/kw_build_inst.sh b/sites/gce/kw_build_inst.sh
@@ -6,14 +6,13 @@ export MILHOJA_CODE_REPO=/home/kweide/projects/Milhoja
 export KW_INSTALL_DIR=/nfs/gce/projects/FLASH5/kweide/local-milhoja/2d
 
 set -xve
-cd ${MILHOJA_CODE_REPO} # top of cloned OrchestrationRuntime repo
+cd ${MILHOJA_CODE_REPO} # top of cloned Milhoja repo
 
 test -f Makefile.configure   && rm -v  Makefile.configure
 test -d build/               && rm -rv build/
 test -d "${KW_INSTALL_DIR}"  && rm -rv "${KW_INSTALL_DIR}"
 ./configure.py --makefile $PWD/sites/gce/Makefile.site.gnu_mpich --dim 2 --runtime HOSTMEM --offload OpenACC --prefix ${KW_INSTALL_DIR} \
 	       --support_exec --support_push --support_packets
 make clean
-# export MILHOJA_TEST_CLONE=/nfs/gce/projects/Milhoja/MilhojaTest
 make -j12 all
 make install
diff --git a/sites/summit/Makefile.site.nvhpc b/sites/summit/Makefile.site.nvhpc
@@ -7,7 +7,6 @@
 BASEDIR      = $(MILHOJA_CODE_REPO)
 AMREXDIR     = $(MILHOJA_TEST_CLONE)/summit/nvhpc_current/AMReX_$(NDIM)d
 GTESTDIR     = $(MILHOJA_TEST_CLONE)/summit/nvhpc_current/googletest
-JSONDIR      = $(OLCF_NLOHMANN_JSON_ROOT)/include
 CUDADIR      = $(OLCF_CUDA_ROOT)
 
 # Define the following compiler-related flags

diff --git a/sites/swing/Makefile.site.nvhpc b/sites/swing/Makefile.site.nvhpc
@@ -14,7 +14,6 @@
 BASEDIR      = 
 AMREXDIR     = $(FLASHX_AMREX$(NDIM)D_DIR)
 GTESTDIR     = $(FLASHX_GTEST_DIR)
-JSONDIR      = /lcrc/project/Flash-X/soft/src/json/include
 CUDADIR      = $(NVHPC_CUDA_HOME)
 
 # Define the following compiler-related flags