Cleanup SST's CMake

source/adios2/CMakeLists.txt

@@ -74,12 +74,12 @@ if(ADIOS2_HAVE_ZeroMQ)
 endif()
 
 if(ADIOS2_HAVE_SST)
+  add_subdirectory(toolkit/sst)
   target_sources(adios2 PRIVATE
     engine/sst/SstReader.cpp
     engine/sst/SstWriter.cpp
   )
-  target_link_libraries(adios2 PRIVATE sst evpath::evpath)
-  add_subdirectory(toolkit/sst)
+  target_link_libraries(adios2 PRIVATE sst)
 endif()
 
 target_sources(adios2 PRIVATE

source/adios2/toolkit/sst/CMakeLists.txt

+add_library(sst
+  dp/dp.c
+  dp/dummy_dp.c
+  cp/cp.c
+  cp/cp_common.c
+)
 
-add_library(sst "")
-set_property(TARGET sst PROPERTY C_STANDARD 99)
-target_include_directories(sst PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${EVPATH_INCLUDE_DIRS} ${MPI_C_INCLUDE_PATH})
-target_link_libraries(sst evpath::evpath ${MPI_C_LIBRARIES})
-
-#  sst sources are defined in the includes
-include(dp/CMakeLists.txt)
-include(cp/CMakeLists.txt)
+target_compile_features(sst PRIVATE c_std_99)
+target_include_directories(sst PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(sst PRIVATE evpath::evpath)
+target_link_libraries(sst PUBLIC MPI::MPI_C)
 
 install(TARGETS sst EXPORT adios2Exports
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

source/adios2/toolkit/sst/cp/CMakeLists.txt

-target_sources(sst PRIVATE "${CMAKE_CURRENT_LIST_DIR}/cp.c"
-                           "${CMAKE_CURRENT_LIST_DIR}/cp_common.c")

source/adios2/toolkit/sst/dp/CMakeLists.txt

-target_sources(sst PRIVATE "${CMAKE_CURRENT_LIST_DIR}/dp.c"
-                           "${CMAKE_CURRENT_LIST_DIR}/dummy_dp.c")