From 94e608e1ade835151a54bef9d924f6bac69380b8 Mon Sep 17 00:00:00 2001
From: Ammar ELWazir <Ammar.ELWazir@amd.com>
Date: Tue, 13 Jun 2023 15:09:11 +0000
Subject: [PATCH] Fixes for Spack

Change-Id: Ib2ea41b8140589fbc74aa297379588cc720e0183


[ROCm/rocprofiler commit: 6c61aa5311e8c55c79241315f27c7f9326f0b065]
---
 projects/rocprofiler/cmake_modules/env.cmake |  6 +++---
 projects/rocprofiler/plugin/ctf/ctf.cpp      | 10 ++++++----
 projects/rocprofiler/test/ctrl/test_kernel.h |  5 +++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/projects/rocprofiler/cmake_modules/env.cmake b/projects/rocprofiler/cmake_modules/env.cmake
index 68c0652020..805e125ccb 100644
--- a/projects/rocprofiler/cmake_modules/env.cmake
+++ b/projects/rocprofiler/cmake_modules/env.cmake
@@ -73,7 +73,7 @@ if ( "${ROCM_ROOT_DIR}" STREQUAL "" )
   message ( FATAL_ERROR "ROCM_ROOT_DIR is not found." )
 endif ()
 
-find_library ( FIND_AQL_PROFILE_LIB "libhsa-amd-aqlprofile64.so" HINTS ${CMAKE_PREFIX_PATH} PATHS ${ROCM_ROOT_DIR} PATH_SUFFIXES lib)
-if (  NOT FIND_AQL_PROFILE_LIB )
-  message ( FATAL_ERROR "AQL_PROFILE not installed. Please install AQL_PROFILE" )
+find_library(FIND_AQL_PROFILE_LIB "libhsa-amd-aqlprofile64.so" HINTS ${CMAKE_PREFIX_PATH} PATHS ${ROCM_ROOT_DIR} PATH_SUFFIXES lib REQUIRED)
+if(NOT FIND_AQL_PROFILE_LIB)
+  message("AQL_PROFILE not installed. Please install AQL_PROFILE")
 endif()
diff --git a/projects/rocprofiler/plugin/ctf/ctf.cpp b/projects/rocprofiler/plugin/ctf/ctf.cpp
index 3cc4034f9b..13b98a36d6 100644
--- a/projects/rocprofiler/plugin/ctf/ctf.cpp
+++ b/projects/rocprofiler/plugin/ctf/ctf.cpp
@@ -48,10 +48,12 @@ ROCPROFILER_EXPORT int rocprofiler_plugin_initialize(const uint32_t rocprofiler_
     return -1;
   }
 
-  auto output_dir = getenv("OUTPUT_PATH");
-  if (output_dir == nullptr) {
-      output_dir = "./";
-  }
+  const char* output_dir = []() -> const char* {
+    if (const char* output_dir_internal = getenv("OUTPUT_PATH"); output_dir_internal != nullptr) {
+      return output_dir_internal;
+    }
+    return "./";
+  }();
 
   // Create the plugin instance.
   try {
diff --git a/projects/rocprofiler/test/ctrl/test_kernel.h b/projects/rocprofiler/test/ctrl/test_kernel.h
index 0bf2949d81..04d87ed9ba 100644
--- a/projects/rocprofiler/test/ctrl/test_kernel.h
+++ b/projects/rocprofiler/test/ctrl/test_kernel.h
@@ -23,8 +23,9 @@ THE SOFTWARE.
 #ifndef TEST_CTRL_TEST_KERNEL_H_
 #define TEST_CTRL_TEST_KERNEL_H_
 
-#include <string.h>
-#include <stdint.h>
+#include <string>
+#include <cstdlib>
+#include <cstdint>
 #include <map>
 #include <string>