[7.0] Make CMakeFile fixes to align with rocDecode and rocJpeg changes (#290)

* Make CMakeFile fixes to align with rocDecode and rocJpeg changes (#281)

* Manually search for rocdecode and rocjpeg libraries in cmake (#294)

* Manually search for rocdecode ad rocjpeg libraries

* Update examples/jpegdecode/CMakeLists.txt

Fix typo.

Co-authored-by: David Galiffi <David.Galiffi@amd.com>

---------

Co-authored-by: David Galiffi <David.Galiffi@amd.com>

---------

Co-authored-by: Sajina PK <Sajina.PuthalathKandy@amd.com>

Author: dgaliffiAMD

examples/jpegdecode/CMakeLists.txt

@@ -60,7 +60,47 @@ if(ROCPROFSYS_DISABLE_EXAMPLES)
     endif()
 endif()
 
-find_package(ROCJPEG QUIET)
+# find rocJPEG - library and headers
+find_path(
+    rocjpeg_ROOT_DIR
+    NAMES include/rocjpeg/rocjpeg.h
+    HINTS ${ROCmVersion_DIR} ${ROCM_PATH}
+    PATHS ${ROCmVersion_DIR} ${ROCM_PATH}
+)
+
+mark_as_advanced(rocjpeg_ROOT_DIR)
+
+find_path(
+    rocjpeg_INCLUDE_DIR
+    NAMES rocjpeg/rocjpeg.h
+    HINTS ${rocjpeg_ROOT_DIR}
+    PATHS ${rocjpeg_ROOT_DIR}
+    PATH_SUFFIXES include
+)
+
+find_library(
+    rocjpeg_LIBRARY
+    NAMES rocjpeg
+    HINTS ${rocjpeg_ROOT_DIR}
+    PATHS ${rocjpeg_ROOT_DIR}
+    PATH_SUFFIXES lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+    rocjpeg
+    FOUND_VAR rocjpeg_FOUND
+    REQUIRED_VARS rocjpeg_INCLUDE_DIR rocjpeg_LIBRARY
+)
+
+if(rocjpeg_FOUND)
+    if(NOT TARGET rocjpeg::rocjpeg)
+        add_library(rocjpeg::rocjpeg INTERFACE IMPORTED)
+        target_link_libraries(rocjpeg::rocjpeg INTERFACE ${rocjpeg_LIBRARY})
+        target_include_directories(rocjpeg::rocjpeg INTERFACE ${rocjpeg_INCLUDE_DIR})
+    endif()
+endif()
+
 find_package(rocprofiler-register QUIET)
 
 # Copy image files to build directory
@@ -95,7 +135,7 @@ endfunction()
 # threads
 find_package(Threads REQUIRED)
 
-if(HIP_FOUND AND ROCJPEG_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND)
+if(HIP_FOUND AND rocjpeg_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND)
     # HIP
     set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host)
     # threads
@@ -107,9 +147,9 @@ if(HIP_FOUND AND ROCJPEG_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND)
     set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocprofiler-register::rocprofiler-register)
 
     # rocJPEG
-    message(STATUS "RocJPEG library found: ${ROCJPEG_LIBRARY}")
-    include_directories(${ROCJPEG_INCLUDE_DIR})
-    set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCJPEG_LIBRARY})
+    message(STATUS "RocJPEG library found: ${rocjpeg_LIBRARY}")
+    include_directories(${rocjpeg_INCLUDE_DIR})
+    set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocjpeg::rocjpeg)
     list(APPEND SOURCES ${PROJECT_SOURCE_DIR} jpegdecodeperf.cpp)
     add_executable(jpegdecode ${SOURCES})
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")
@@ -132,15 +172,15 @@ else()
     if(NOT HIP_FOUND)
         message(FATAL_ERROR "-- ERROR!: HIP Not Found! - please install ROCm and HIP!")
     endif()
-    if(NOT ROCJPEG_FOUND)
+    if(NOT rocjpeg_FOUND)
         message(WARNING "-- ERROR!: rocJPEG Not Found! - please install rocJPEG!")
     endif()
     if(NOT Threads_FOUND)
-        message(FATAL_ERROR "-- ERROR!: Threads Not Found! - please insatll Threads!")
+        message(WARNING "-- ERROR!: Threads Not Found! - please install Threads!")
     endif()
     if(NOT rocprofiler-register_FOUND)
         message(
-            FATAL_ERROR
+            WARNING
             "-- ERROR!: rocprofiler-register Not Found! - please install rocprofiler-register!"
         )
     endif()

examples/videodecode/CMakeLists.txt

@@ -54,8 +54,48 @@ function(videodecode_message _MSG_TYPE)
 endfunction()
 
 # Find RocDecode
-find_package(ROCDECODE QUIET)
-if(NOT ROCDECODE_FOUND)
+find_path(
+    rocdecode_ROOT_DIR
+    NAMES include/rocdecode/rocdecode.h
+    HINTS ${ROCmVersion_DIR} ${ROCM_PATH}
+    PATHS ${ROCmVersion_DIR} ${ROCM_PATH}
+)
+
+mark_as_advanced(rocdecode_ROOT_DIR)
+
+find_path(
+    rocdecode_INCLUDE_DIR
+    NAMES rocdecode/rocdecode.h
+    HINTS ${rocdecode_ROOT_DIR}
+    PATHS ${rocdecode_ROOT_DIR}
+    PATH_SUFFIXES include
+)
+
+find_library(
+    rocdecode_LIBRARY
+    NAMES rocdecode
+    HINTS ${rocdecode_ROOT_DIR}
+    PATHS ${rocdecode_ROOT_DIR}
+    PATH_SUFFIXES lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+    rocdecode
+    FOUND_VAR rocdecode_FOUND
+    REQUIRED_VARS rocdecode_INCLUDE_DIR rocdecode_LIBRARY
+)
+
+if(rocdecode_FOUND)
+    if(NOT TARGET rocdecode::rocdecode)
+        add_library(rocdecode::rocdecode INTERFACE IMPORTED)
+        target_link_libraries(rocdecode::rocdecode INTERFACE ${rocdecode_LIBRARY})
+        target_include_directories(
+            rocdecode::rocdecode
+            INTERFACE ${rocdecode_INCLUDE_DIR}
+        )
+    endif()
+else()
     videodecode_message(AUTHOR_WARNING "${PROJECT_NAME} skipped. Missing RocDecode...")
     return()
 endif()
@@ -102,7 +142,7 @@ set(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR})
 
 mark_as_advanced(FFMPEG_INCLUDE_DIR AVCODEC_LIBRARY AVFORMAT_LIBRARY AVUTIL_LIBRARY)
 
-if(FFMPEG_FOUND AND ROCDECODE_FOUND)
+if(FFMPEG_FOUND AND rocdecode_FOUND)
     # HIP
     set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host)
 
@@ -116,8 +156,8 @@ if(FFMPEG_FOUND AND ROCDECODE_FOUND)
     endif()
 
     # rocDecode
-    include_directories(${ROCDECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
-    set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY})
+    include_directories(${rocdecode_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
+    set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocdecode::rocdecode)
 
     # Threads
     set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -155,7 +195,7 @@ else()
     if(NOT FFMPEG_FOUND)
         message(WARNING "-- ERROR!: FFMPEG Not Found! - please install FFMPEG!")
     endif()
-    if(NOT ROCDECODE_FOUND)
+    if(NOT rocdecode_FOUND)
         message(WARNING "-- ERROR!: rocDecode Not Found! - please install rocDecode!")
     endif()
 endif()