CMake config - updates and fixes (#532)

* CMake Config - updates and fixes * Version - Updates * Changelog - updates * Update CHANGELOG.md Co-authored-by: spolifroni-amd <Sandra.Polifroni@amd.com> --------- Co-authored-by: spolifroni-amd <Sandra.Polifroni@amd.com> [ROCm/rocdecode commit: 6b026af151]
2025-03-17 11:38:01 -05:00
@@ -944,8 +944,8 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.

 INPUT                  = README.md \
-                        api/rocDecode.h \
-                        api/rocparser.h \
+                        api/rocdecode/rocdecode.h \
+                        api/rocdecode/rocparser.h \
                        utils/rocvideodecode/roc_video_dec.h \
                        utils/video_demuxer.h

@@ -2,4 +2,5 @@ build/
 samples/*/build
 .vscode/
 doxygen_output*
-samples/videoDecodeMultiFiles/example.txt
+samples/videoDecodeMultiFiles/example.txt
+api/rocdecode_version.h
@@ -2,7 +2,7 @@

 Full documentation for rocDecode is available at [https://rocm.docs.amd.com/projects/rocDecode/en/latest/](https://rocm.docs.amd.com/projects/rocDecode/en/latest/)

-## (Unreleased) rocDecode 0.11.1
+## rocDecode 0.12.0 for ROCm 6.5

 ### Added

@@ -10,6 +10,7 @@ Full documentation for rocDecode is available at [https://rocm.docs.amd.com/proj
 * CTest for VP9 decode on bitstream reader.
 * HEVC stream syntax error handling.
 * HEVC stream bit depth change handling through decoder reconfiguration.
+* rocDecode now uses the Cmake CMAKE_PREFIX_PATH directive.

 ### Changed

@@ -38,8 +38,8 @@ endif()
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED On)

-# NOTE: Match version with api/rocdecode_version.h
-set(VERSION "0.11.1")
+# rocDecode Version
+set(VERSION "0.12.0")

 # Set Project Version and Language
 project(rocdecode VERSION ${VERSION} LANGUAGES CXX)
@@ -80,7 +80,7 @@ message("-- ${BoldBlue}rocDecode Version -- ${VERSION}${ColourReset}")
 message("-- ${BoldBlue}rocDecode Install Path -- ${CMAKE_INSTALL_PREFIX}${ColourReset}")

 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
-list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH} ${ROCM_PATH}/hip)
+list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)

 # rocDecode Build Type
 if(NOT CMAKE_BUILD_TYPE)
@@ -151,12 +151,18 @@ if(HIP_FOUND AND Libva_FOUND)
      ROCDECODE_ROCP_REG_VERSION_PATCH=${VERSION_PATCH})
  endif()

+  #Generate BUILD_INFO
+  configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/api/rocdecode_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/rocdecode_version.h @ONLY )
+  install(TARGETS ${PROJECT_NAME} EXPORT rocdecode-targets DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev)
+
  # install rocDecode libs -- {ROCM_PATH}/lib
  install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime NAMELINK_SKIP)
  install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev NAMELINK_ONLY)
  install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT asan)
  # install rocDecode include files -- {ROCM_PATH}/include/rocdecode
-  install(FILES api/rocdecode.h api/rocparser.h api/roc_bitstream_reader.h api/rocdecode_version.h
+  install(FILES api/rocdecode/rocdecode.h api/rocdecode/rocparser.h api/rocdecode/roc_bitstream_reader.h
+          DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} COMPONENT dev)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rocdecode_version.h
          DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} COMPONENT dev)
  # install rocDecode api trace include file -- {ROCM_PATH}/include/rocdecode/amd_detail
  install(FILES api/amd_detail/rocdecode_api_trace.h
@@ -192,6 +198,49 @@ if(HIP_FOUND AND Libva_FOUND)
  message("-- ${White}AMD ROCm rocDecode -- CMAKE_CXX_FLAGS:${CMAKE_CXX_FLAGS}${ColourReset}")
  message("-- ${White}AMD ROCm rocDecode -- Link Libraries: ${LINK_LIBRARY_LIST}${ColourReset}")

+  ## Cmake module config file configurations
+  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/" CACHE INTERNAL "Default module path.")
+
+  ## Export the package for use from the build-tree
+  ## (this registers the build-tree with a global CMake-registry)
+  export(PACKAGE ${PROJECT_NAME})
+  set(CONF_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+
+  ## Create the rocdecode-config.cmake and rocdecode-config-version files
+  include(CMakePackageConfigHelpers)
+  set(CONFIG_PACKAGE_INSTALL_DIR ${CONF_LIB_DIR}/cmake/${PROJECT_NAME})
+  set(LIB_INSTALL_DIR  "${CMAKE_INSTALL_LIBDIR}")
+  set(INCLUDE_INSTALL_DIR  "${CMAKE_INSTALL_INCLUDEDIR}")
+  set(BIN_INSTALL_DIR  "${CMAKE_INSTALL_BINDIR}")
+
+  ## Generate Config File for rocdecode
+  configure_package_config_file(
+    ${CMAKE_MODULE_PATH}/${PROJECT_NAME}-config.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
+    INSTALL_DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR}
+    PATH_VARS LIB_INSTALL_DIR INCLUDE_INSTALL_DIR BIN_INSTALL_DIR
+  )
+
+  ## Generate config Version File for rocdecode
+  write_basic_package_version_file(
+    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
+    VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
+    COMPATIBILITY SameMajorVersion
+  )
+
+  ## Install the rocdecode-config.cmake and rocdecode-config-version.cmake
+  install(FILES
+    "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+    "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
+    COMPONENT dev
+  )
+
+  ## Install the export set for use with the install-tree
+  install(EXPORT rocdecode-targets DESTINATION
+    "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" COMPONENT dev
+  )
+
  # make test with CTest
  enable_testing()
  include(CTest)
@@ -21,9 +21,9 @@ THE SOFTWARE.
 */
 #pragma once

-#include "rocdecode.h"
-#include "rocparser.h"
-#include "roc_bitstream_reader.h"
+#include "rocdecode/rocdecode.h"
+#include "rocdecode/rocparser.h"
+#include "rocdecode/roc_bitstream_reader.h"

 // Define version macros for the rocDecode API dispatch table, specifying the MAJOR and STEP versions.
 //
@@ -22,7 +22,7 @@ THE SOFTWARE.

 #pragma once

-#include "rocdecode.h"
+#include "rocdecode/rocdecode.h"

 /*!
 * \file
@@ -30,7 +30,6 @@ THE SOFTWARE.

 #pragma once
 #include "hip/hip_runtime.h"
-#include "rocdecode_version.h"

 /*!
 * \file
@@ -22,7 +22,7 @@ THE SOFTWARE.

 #pragma once

-#include "rocdecode.h"
+#include "rocdecode/rocdecode.h"

 /*!
 * \file
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */

-#ifndef ROCDECODE_VERSION_H
-#define ROCDECODE_VERSION_H
+#ifndef _ROCDECODE_VERSION_H_
+#define _ROCDECODE_VERSION_H_

 /*!
 * \file
@@ -32,12 +32,11 @@ THE SOFTWARE.

 #ifdef __cplusplus
 extern "C" {
-#endif
-/* NOTE: Match version with CMakeLists.txt */
-#define ROCDECODE_MAJOR_VERSION 0
-#define ROCDECODE_MINOR_VERSION 11
-#define ROCDECODE_MICRO_VERSION 1
+#endif  /* __cplusplus */

+#define ROCDECODE_MAJOR_VERSION   @PROJECT_VERSION_MAJOR@
+#define ROCDECODE_MINOR_VERSION   @PROJECT_VERSION_MINOR@
+#define ROCDECODE_MICRO_VERSION   @PROJECT_VERSION_PATCH@

 /**
 * ROCDECODE_CHECK_VERSION:
@@ -45,7 +44,7 @@ extern "C" {
 * @minor: minor version, like 2 in 1.2.3
 * @micro: micro version, like 3 in 1.2.3
 *
- * Evaluates to %TRUE if the version of rocDecode is greater than
+ * Evaluates to %TRUE if the version of ROCDECODE is greater than
 * @major, @minor and @micro
 */
 #define ROCDECODE_CHECK_VERSION(major, minor, micro) \
@@ -54,7 +53,7 @@ extern "C" {
        (ROCDECODE_MAJOR_VERSION == (major) && ROCDECODE_MINOR_VERSION == (minor) && ROCDECODE_MICRO_VERSION >= (micro)))

 #ifdef __cplusplus
-}
+}  // end extern "C" block
 #endif

-#endif
+#endif  //_ROCDECODE_VERSION_H_  header guard
@@ -1,77 +0,0 @@
-################################################################################
-# Copyright (c) 2023 - 2025 Advanced Micro Devices, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-################################################################################
-
-# ROCM Path
-if(ROCM_PATH)
-    message("-- ${White}FindrocDecode: ROCM_PATH Set -- ${ROCM_PATH}${ColourReset}")
-else()
-    set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path")
-endif()
-
-# find rocDecode - library and headers
-find_path(ROCDECODE_INCLUDE_DIR NAMES rocdecode.h PATHS ${ROCM_PATH}/include/rocdecode)
-find_library(ROCDECODE_LIBRARY NAMES rocdecode HINTS ${ROCM_PATH}/lib)
-mark_as_advanced(ROCDECODE_INCLUDE_DIR)
-mark_as_advanced(ROCDECODE_LIBRARY)
-
-if(ROCDECODE_INCLUDE_DIR AND ROCDECODE_LIBRARY)
-    message("-- ${White}FindrocDecode -- Using rocDecode: \n\tIncludes:${ROCDECODE_INCLUDE_DIR}\n\tLib:${ROCDECODE_LIBRARY}${ColourReset}")
-    set(ROCDECODE_FOUND TRUE)
-else()
-    if(rocDecode_FIND_REQUIRED)
-        message(FATAL_ERROR "FindrocDecode -- Failed to find rocDecode Library")
-    endif()
-    message( "-- ${Yellow}NOTE: FindrocDecode failed to find rocDecode -- INSTALL rocDecode${ColourReset}" )
-endif()
-
-if(ROCDECODE_FOUND)
-    # Find rocDecode Version
-    file(READ "${ROCDECODE_INCLUDE_DIR}/rocdecode_version.h" ROCDECODE_VERSION_FILE)
-    string(REGEX MATCH "ROCDECODE_MAJOR_VERSION ([0-9]*)" _ ${ROCDECODE_VERSION_FILE})
-    set(ROCDECODE_VER_MAJOR ${CMAKE_MATCH_1})
-    string(REGEX MATCH "ROCDECODE_MINOR_VERSION ([0-9]*)" _ ${ROCDECODE_VERSION_FILE})
-    set(ROCDECODE_VER_MINOR ${CMAKE_MATCH_1})
-    string(REGEX MATCH "ROCDECODE_MICRO_VERSION ([0-9]*)" _ ${ROCDECODE_VERSION_FILE})
-    set(ROCDECODE_VER_MICRO ${CMAKE_MATCH_1})
-    message("-- ${White}Found rocDecode Version: ${ROCDECODE_VER_MAJOR}.${ROCDECODE_VER_MINOR}.${ROCDECODE_VER_MICRO}${ColourReset}")
-    mark_as_advanced(ROCDECODE_VER_MAJOR)
-    mark_as_advanced(ROCDECODE_VER_MINOR)
-    mark_as_advanced(ROCDECODE_VER_MICRO)
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(
-    rocDecode
-    FOUND_VAR  
-        ROCDECODE_FOUND 
-    REQUIRED_VARS
-        ROCDECODE_INCLUDE_DIR
-        ROCDECODE_LIBRARY
-)
-
-set(ROCDECODE_FOUND ${ROCDECODE_FOUND} CACHE INTERNAL "")
-set(ROCDECODE_INCLUDE_DIR ${ROCDECODE_INCLUDE_DIR} CACHE INTERNAL "")
-set(ROCDECODE_LIBRARY ${ROCDECODE_LIBRARY} CACHE INTERNAL "")
-set(ROCDECODE_VER_MAJOR ${ROCDECODE_VER_MAJOR} CACHE INTERNAL "")
-set(ROCDECODE_VER_MINOR ${ROCDECODE_VER_MINOR} CACHE INTERNAL "")
-set(ROCDECODE_VER_MICRO ${ROCDECODE_VER_MICRO} CACHE INTERNAL "")
@@ -0,0 +1,22 @@
+# - Config file for the rocdecode package
+# It defines the following variables
+#  ROCDECODE_INCLUDE_DIR - include directory for rocdecode
+#  ROCDECODE_LIB_DIR     - library directory for rocdecode
+#  ROCDECODE_LIBRARY     - library to link against
+
+@PACKAGE_INIT@
+
+# Compute paths
+set_and_check(rocdecode_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+set_and_check(ROCDECODE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+set_and_check(rocDecode_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+set_and_check(rocdecode_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
+set_and_check(ROCDECODE_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
+set_and_check(rocDecode_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
+set_and_check(rocdecode_LIBRARY "@PACKAGE_LIB_INSTALL_DIR@/librocdecode.so")
+set_and_check(ROCDECODE_LIBRARY "@PACKAGE_LIB_INSTALL_DIR@/librocdecode.so")
+set_and_check(rocDecode_LIBRARY "@PACKAGE_LIB_INSTALL_DIR@/librocdecode.so")
+
+
+get_filename_component(ROCDECODE_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+include("${ROCDECODE_CMAKE_DIR}/rocdecode-targets.cmake")
@@ -944,8 +944,8 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.

 INPUT                  = ../reference/index.md \
-                                ../../api/rocdecode.h \
-                                ../../api/rocparser.h \
+                                ../../api/rocdecode/rocdecode.h \
+                                ../../api/rocdecode/rocparser.h \
                                ../../utils/rocvideodecode/roc_video_dec.h \
                                ../../utils/video_demuxer.h

@@ -41,7 +41,7 @@ set(CMAKE_CXX_STANDARD 17)
 project(videodecode)

 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
-list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH})
+list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)

 # rocDecode sample build type
 set(DEFAULT_BUILD_TYPE "Release")
@@ -61,10 +61,10 @@ else()
 endif()

 find_package(HIP QUIET)
-find_package(FFmpeg QUIET)
-find_package(rocDecode QUIET)
-find_package(Threads REQUIRED)
+find_package(ROCDECODE QUIET)
 find_package(rocprofiler-register QUIET)
+find_package(FFmpeg QUIET)
+find_package(Threads REQUIRED)

 if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND)
    # HIP
@@ -37,7 +37,7 @@ THE SOFTWARE.
    #include <experimental/filesystem>
 #endif
 #include "video_demuxer.h"
-#include "roc_bitstream_reader.h"
+#include "rocdecode/roc_bitstream_reader.h"
 #include "roc_video_dec.h"
 #include "ffmpeg_video_dec.h"
 #include "common.h"
@@ -41,7 +41,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED On)
 project(videodecodebatch)

 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
-list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH})
+list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)

 # rocDecode sample build type
 set(DEFAULT_BUILD_TYPE "Release")
@@ -61,9 +61,9 @@ else()
 endif()

 find_package(HIP QUIET)
-find_package(FFmpeg QUIET)
-find_package(rocDecode QUIET)
+find_package(ROCDECODE QUIET)
 find_package(rocprofiler-register QUIET)
+find_package(FFmpeg QUIET)

 if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND rocprofiler-register_FOUND)
    # HIP
@@ -42,7 +42,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED On)
 project(videodecodemem)

 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
-list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH})
+list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)

 # rocDecode sample build type
 set(DEFAULT_BUILD_TYPE "Release")
@@ -62,9 +62,9 @@ else()
 endif()

 find_package(HIP QUIET)
-find_package(FFmpeg QUIET)
-find_package(rocDecode QUIET)
+find_package(ROCDECODE QUIET)
 find_package(rocprofiler-register QUIET)
+find_package(FFmpeg QUIET)

 if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND rocprofiler-register_FOUND)
    # HIP
@@ -41,7 +41,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED On)
 project(videodecodemultifiles)

 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
-list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH})
+list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)

 # rocDecode sample build type
 set(DEFAULT_BUILD_TYPE "Release")
@@ -61,9 +61,9 @@ else()
 endif()

 find_package(HIP QUIET)
-find_package(FFmpeg QUIET)
-find_package(rocDecode QUIET)
+find_package(ROCDECODE QUIET)
 find_package(rocprofiler-register QUIET)
+find_package(FFmpeg QUIET)

 if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND rocprofiler-register_FOUND)
    # HIP
@@ -41,7 +41,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED On)
 project(videodecodeperf)

 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
-list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH})
+list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)

 # rocDecode sample build type
 set(DEFAULT_BUILD_TYPE "Release")
@@ -61,9 +61,9 @@ else()
 endif()

 find_package(HIP QUIET)
-find_package(FFmpeg QUIET)
-find_package(rocDecode QUIET)
+find_package(ROCDECODE QUIET)
 find_package(rocprofiler-register QUIET)
+find_package(FFmpeg QUIET)

 if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND)
    # HIP
@@ -41,7 +41,7 @@ set(CMAKE_CXX_STANDARD 17)
 project(videodecodepicfiles)

 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
-list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH})
+list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)

 # rocDecode sample build type
 set(DEFAULT_BUILD_TYPE "Release")
@@ -61,10 +61,10 @@ else()
 endif()

 find_package(HIP QUIET)
-find_package(FFmpeg QUIET)
-find_package(rocDecode QUIET)
-find_package(Threads REQUIRED)
+find_package(ROCDECODE QUIET)
 find_package(rocprofiler-register QUIET)
+find_package(FFmpeg QUIET)
+find_package(Threads REQUIRED)

 if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND)
    # HIP
@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include <sys/stat.h>
 #include <libgen.h>
 #include "video_demuxer.h"
-#include "roc_bitstream_reader.h"
+#include "rocdecode/roc_bitstream_reader.h"
 #include "roc_video_dec.h"
 #include "ffmpeg_video_dec.h"
 #include "common.h"
@@ -41,7 +41,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED On)
 project(videodecodergb)

 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
-list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH})
+list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)

 # rocDecode sample build type
 set(DEFAULT_BUILD_TYPE "Release")
@@ -97,9 +97,9 @@ endif()
 message("-- ${White}${PROJECT_NAME} -- AMD GPU_TARGETS: ${GPU_TARGETS}${ColourReset}")

 find_package(HIP QUIET)
-find_package(FFmpeg QUIET)
-find_package(rocDecode QUIET)
+find_package(ROCDECODE QUIET)
 find_package(rocprofiler-register QUIET)
+find_package(FFmpeg QUIET)

 if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND rocprofiler-register_FOUND)
    # HIP
@@ -41,7 +41,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED On)
 project(videodecoderaw)

 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
-list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH})
+list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)

 # rocDecode sample build type
 set(DEFAULT_BUILD_TYPE "Release")
@@ -61,7 +61,7 @@ else()
 endif()

 find_package(HIP QUIET)
-find_package(rocDecode QUIET)
+find_package(ROCDECODE QUIET)
 find_package(rocprofiler-register QUIET)

 if(HIP_FOUND AND ROCDECODE_FOUND AND rocprofiler-register_FOUND)
@@ -37,7 +37,7 @@ THE SOFTWARE.
    #include <experimental/filesystem>
 #endif
 
-#include "roc_bitstream_reader.h"
+#include "rocdecode/roc_bitstream_reader.h"
 #include "roc_video_dec.h"

 typedef enum ReconfigFlushMode_enum {
@@ -41,7 +41,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED On)
 project(videotosequence)

 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
-list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH})
+list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)

 # rocDecode sample build type
 set(DEFAULT_BUILD_TYPE "Release")
@@ -61,9 +61,9 @@ else()
 endif()

 find_package(HIP QUIET)
-find_package(FFmpeg QUIET)
-find_package(rocDecode QUIET)
+find_package(ROCDECODE QUIET)
 find_package(rocprofiler-register QUIET)
+find_package(FFmpeg QUIET)

 if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND rocprofiler-register_FOUND)
    # HIP
@@ -23,7 +23,7 @@ THE SOFTWARE.

 #include <memory>
 #include <string>
-#include "roc_bitstream_reader.h"
+#include "rocdecode/roc_bitstream_reader.h"
 #include "es_reader.h"

 class RocBitstreamReaderHandle {
@@ -25,7 +25,7 @@ THE SOFTWARE.
 #include <iostream>
 #include <fstream>
 #include <vector>
-#include "rocdecode.h"
+#include "rocdecode/rocdecode.h"

 #define BS_RING_SIZE (16 * 1024 * 1024)
 #define INIT_PIC_DATA_SIZE (2 * 1024 * 1024)
@@ -23,7 +23,7 @@ THE SOFTWARE.

 #include <memory>
 #include <string>
-#include "rocparser.h"
+#include "rocdecode/rocparser.h"
 #include "roc_video_parser.h"
 #include "avc_parser.h"
 #include "av1_parser.h"
@@ -24,7 +24,7 @@ THE SOFTWARE.
 #include <memory>
 #include <string>
 #include <vector>
-#include "rocparser.h"
+#include "rocdecode/rocparser.h"
 #include "../commons.h"

 typedef enum ParserResult {
@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include <sstream>
 #include <string.h>
 #include <map>
-#include "../api/rocdecode.h"
+#include "../api/rocdecode/rocdecode.h"
 #include <hip/hip_runtime.h>
 #include "vaapi/vaapi_videodecoder.h"

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 #include "dec_handle.h"
-#include "rocdecode.h"
+#include "rocdecode/rocdecode.h"
 #include "vaapi_videodecoder.h"
 #include "../commons.h"

@@ -40,7 +40,7 @@ THE SOFTWARE.
 #include <va/va_drm.h>
 #include <va/va_drmcommon.h>
 #include "../../commons.h"
-#include "../../../api/rocdecode.h"
+#include "../../../api/rocdecode/rocdecode.h"

 #define CHECK_HIP(call) {\
    hipError_t hip_status = call;\
@@ -53,15 +53,25 @@ project(rocdecode-test)
 enable_testing()
 include(CTest)

-# add find modules
-list(APPEND CMAKE_MODULE_PATH ${ROCM_PATH}/share/rocdecode/cmake)
+# add ROCm find Config location
+list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)

 # find rocDecode
-find_package(rocDecode QUIET)
+find_package(ROCDECODE QUIET)

-if(NOT ROCDECODE_FOUND)
-    message("-- ${Yellow}${PROJECT_NAME} requires rocDecode. Install rocDecode before running CTests")
-endif()
+if(ROCDECODE_FOUND)
+  message("-- ${White}${PROJECT_NAME}: rocDecode found with find_package(ROCDECODE QUIET)${ColourReset}")
+  message("-- \t${White}ROCDECODE_INCLUDE_DIR -- ${ROCDECODE_INCLUDE_DIR}${ColourReset}")
+  message("-- \t${White}ROCDECODE_LIB_DIR -- ${ROCDECODE_LIB_DIR}${ColourReset}")
+  message("-- \t${White}ROCDECODE_LIBRARY -- ${ROCDECODE_LIBRARY}${ColourReset}")
+  message("-- \t${White}ROCDECODE_FOUND -- ${ROCDECODE_FOUND}${ColourReset}")
+  message("-- \t${White}ROCDECODE_VERSION -- ${ROCDECODE_VERSION}${ColourReset}")
+  message("-- \t${White}ROCDECODE_VERSION_MAJOR -- ${ROCDECODE_VERSION_MAJOR}${ColourReset}")
+  message("-- \t${White}ROCDECODE_VERSION_MINOR -- ${ROCDECODE_VERSION_MINOR}${ColourReset}")
+  message("-- \t${White}ROCDECODE_VERSION_PATCH -- ${ROCDECODE_VERSION_PATCH}${ColourReset}")
+else()
+  message("-- ${Yellow}${PROJECT_NAME} requires rocDecode. Install rocDecode before running CTests")
+endif(ROCDECODE_FOUND)

 # 1 - videoDecode HEVC
 add_test(
@@ -37,8 +37,8 @@ THE SOFTWARE.
 #include <unordered_map>
 #include <chrono>
 #include <hip/hip_runtime.h>
-#include "rocdecode.h"
-#include "rocparser.h"
+#include "rocdecode/rocdecode.h"
+#include "rocdecode/rocparser.h"

 /*!
 * \file
@@ -31,7 +31,7 @@ extern "C" {
    #endif
 }

-#include "rocdecode.h"
+#include "rocdecode/rocdecode.h"

 /*!
 * \file