CMake: Avoid unconditional rebuilds during partial rebuilds

Author: evan-charmworks

benchmarks/ampi/pingpong/Makefile

@@ -5,17 +5,19 @@ MPIOPTS=-O3
 CHARMC=../../../bin/ampicxx $(OPTS)
 MPICC=mpicc $(MPIOPTS) # Should use 'cc' instead of 'mpicc' on Cray systems
 
-#all : pingpong-2way.c
-#	$(CHARMC) pingpong-2way.c -o pingpong
-#	$(MPICC) pingpong-2way.c -o pingpong-mpi
+all: pingpong
 
-all : pingpong-1way.c
-	$(CHARMC) pingpong-1way.c -o pingpong
-#	$(MPICC) pingpong-1way.c -o pingpong-mpi
+pingpong: pingpong-1way.c
+	$(CHARMC) $^ -o $@
+#	$(MPICC) $^ -o $@-mpi
 
-pipe: pingpong-pipeline.c
-	$(CHARMC) pingpong-pipeline.c -o pingpong-pipe
-	$(MPICC) pingpong-pipeline.c -o pingpong-pipe-mpi
+pongpong-2way: pingpong-2way.c
+	$(CHARMC) $^ -o $@
+#	$(MPICC) $^ -o $@-mpi
+
+pingpong-pipeline: pingpong-pipeline.c
+	$(CHARMC) $^ -o $@
+#	$(MPICC) $^ -o $@-mpi
 
 test: all
 	$(call run, +p1 ./pingpong 16 1048576 100 10 1 +vp2)
@@ -34,5 +36,5 @@ ifeq ($(CMK_USE_CMA),1)
 endif
 
 clean:
-	rm -rf charmrun conv-host moduleinit* *.o pingpong pingpong pingpong-mpi pingpong-pipe pingpong-pipe-mpi *~ *.sts core ampirun
+	rm -rf charmrun conv-host moduleinit* *.o pingpong pingpong-mpi pingpong-2way pingpong-2way-mpi pingpong-pipeline pingpong-pipeline-mpi *~ *.sts core ampirun
 

cmake/ci-files.cmake

@@ -44,6 +44,10 @@ foreach(in_f ${ci-files})
         set(ci-output ControlPointsNoTrace.decl.h)
     elseif(${in_f} MATCHES src/ck-core/mpi-mainmodule.ci)
         set(ci-output mpi_main.decl.h)
+    elseif(${in_f} MATCHES src/libs/ck-libs/sparseContiguousReducer/cksparsecontiguousreducer.ci)
+        set(ci-output CkSparseContiguousReducer.decl.h)
+    elseif(${in_f} MATCHES src/libs/ck-libs/sparseReducer/cksparsereducer.ci)
+        set(ci-output CkSparseReducer.decl.h)
     elseif(${in_f} MATCHES src/libs/ck-libs/multiphaseSharedArrays/msa-DistPageMgr.ci)
         set(ci-output msa.decl.h)
     elseif(${in_f} MATCHES src/libs/ck-libs/pythonCCS/charmdebug-python.ci)
@@ -70,6 +74,9 @@ foreach(in_f ${ci-files})
         set(ci-output TMR_Interface.decl.h)
     elseif(${in_f} MATCHES src/libs/ck-libs/pmaf/chunk.ci)
         set(ci-output PMAF.decl.h)
+    elseif(${in_f} MATCHES src/libs/ck-libs/pmaf/pgm.ci)
+        # set(ci-output Pgm.decl.h) # disabled ; should be renamed ; not needed during LIBS build
+        continue()
     elseif(${in_f} MATCHES src/ck-perf/trace-Tau.ci)
         set(ci-output TraceTau.decl.h)
     elseif(${in_f} MATCHES src/ck-perf/trace-summary.ci)
@@ -84,6 +91,12 @@ foreach(in_f ${ci-files})
     else()
         # ci filename equal to module name
         get_filename_component(ci-output ${in_f} NAME_WE)
+
+        # avoid ._* files on macOS:
+        if(ci-output STREQUAL "")
+            continue()
+        endif()
+
         string(APPEND ci-output ".decl.h")
     endif()