Merge branch 'reconverse-shmem' into reconverse-support

Author: ritvikrao

CMakeLists.txt

@@ -728,12 +728,6 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/src/arch/${VDIR}/conv-mach-pxshm.sh)
   configure_file(src/arch/${VDIR}/conv-mach-pxshm.h          include/ COPYONLY)
 endif()
 
-if(${CMK_USE_SHMEM})
-  if (EXISTS ${CMAKE_SOURCE_DIR}/src/conv-core/cmishmem.h)
-    configure_file(src/conv-core/cmishmem.h                  include/ COPYONLY)
-  endif()
-endif()
-
 if(EXISTS ${CMAKE_SOURCE_DIR}/src/arch/${VDIR}/conv-mach-sysvshm.sh)
   configure_file(src/arch/${VDIR}/conv-mach-sysvshm.sh       include/ COPYONLY)
   configure_file(src/arch/${VDIR}/conv-mach-sysvshm.h        include/ COPYONLY)

cmake/fetch_reconverse/CMakeLists.txt

@@ -27,4 +27,5 @@ FetchContent_MakeAvailable(reconverse)
 set(BUILD_SHARED_LIBS ${_save_BUILD_SHARED_LIBS} CACHE INTERNAL "")
 
 configure_file(${reconverse_SOURCE_DIR}/include/converse.h ${CMAKE_BINARY_DIR}/include/ COPYONLY)
+configure_file(${reconverse_SOURCE_DIR}/src/cldb.h ${CMAKE_BINARY_DIR}/include/ COPYONLY)
 configure_file(${reconverse_SOURCE_DIR}/include/charm-config.h ${CMAKE_BINARY_DIR}/include/ COPYONLY)