#2183: Make vt_ldms_includes/lib optional

DARMA-tasking · Nov 9, 2023 · 0768439 · 0768439
1 parent 4bfd0ae
commit 0768439
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/cmake/check_system_functions.cmake b/cmake/check_system_functions.cmake
@@ -32,12 +32,3 @@ check_function_exists(sysinfo vt_has_sysinfo)
 
 set(CMAKE_REQUIRED_INCLUDES "mach/mach.h")
 check_function_exists(mach_task_self vt_has_mach_task_self)
-
-set(CMAKE_REQUIRED_INCLUDES "ldms/ldms.h")
-check_function_exists(ldms_h vt_has_ldms_h)
-
-set(CMAKE_REQUIRED_INCLUDES "ldms/ldmsd_stream.h")
-check_function_exists(ldmsd_stream_h vt_has_ldmsd_stream_h)
-
-set(CMAKE_REQUIRED_INCLUDES "ovis_util/util.h")
-check_function_exists(ovis_util_h vt_has_ovis_util_h)
diff --git a/cmake/configure_options.cmake b/cmake/configure_options.cmake
@@ -92,8 +92,17 @@ endif()
 
 if (${vt_ldms_enabled})
     message(STATUS "LDMS enabled")
-    message(STATUS "LDMS: vt_ldms_includes:${vt_ldms_includes}")
-    message(STATUS "LDMS: vt_ldms_libs:${vt_ldms_libs}")
+    if(${vt_ldms_includes})
+      message(STATUS "Using user provided vt_ldms_includes=${vt_ldms_includes}")
+    else()
+      message(STATUS "vt_ldms_includes CMake variable not set")
+    endif()
+    if(${vt_ldms_libs})
+      message(STATUS "Using user provided vt_ldms_libs=${vt_ldms_libs}")
+    else()
+      message(STATUS "vt_ldms_libs CMake variable not set")
+    endif()
+
     set(vt_feature_cmake_ldms "1")
 else()
     message(STATUS "LDMS disabled")

diff --git a/cmake/link_vt.cmake b/cmake/link_vt.cmake
@@ -216,13 +216,20 @@ function(link_target_with_vt)
     if (${ARG_DEBUG_LINK})
       message(STATUS "link_target_with_vt: ldms=${vt_ldms_enabled}")
     endif()
-    target_include_directories(${ARG_TARGET} SYSTEM PUBLIC
-      ${vt_ldms_includes}
-    )
-    target_link_directories(${ARG_TARGET} PUBLIC ${vt_ldms_libs})
+
+    if(${vt_ldms_includes})
+      target_include_directories(${ARG_TARGET} SYSTEM PUBLIC
+        ${vt_ldms_includes}
+      )
+    endif()
+
+    if(${vt_ldms_libs})
+      target_link_directories(${ARG_TARGET} PUBLIC ${vt_ldms_libs})
+    endif()
+
     target_link_libraries(
-      ${ARG_TARGET} PUBLIC ${ARG_BUILD_TYPE} :libldms.so :libldmsd_stream.so
-    )
+        ${ARG_TARGET} PUBLIC ${ARG_BUILD_TYPE} :libldms.so :libldmsd_stream.so
+      )
   endif()
 
   if (${ARG_CUSTOM_LINK_ARGS})