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]

projects/rocdecode/samples/videoDecode/CMakeLists.txt

@@ -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

projects/rocdecode/samples/videoDecode/videodecode.cpp

@@ -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"

projects/rocdecode/samples/videoDecodeBatch/CMakeLists.txt

@@ -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

projects/rocdecode/samples/videoDecodeMem/CMakeLists.txt

@@ -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

projects/rocdecode/samples/videoDecodeMultiFiles/CMakeLists.txt

@@ -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

projects/rocdecode/samples/videoDecodePerf/CMakeLists.txt

@@ -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

projects/rocdecode/samples/videoDecodePicFiles/CMakeLists.txt

@@ -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

projects/rocdecode/samples/videoDecodePicFiles/videodecodepicfiles.cpp

@@ -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"

projects/rocdecode/samples/videoDecodeRGB/CMakeLists.txt

@@ -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

projects/rocdecode/samples/videoDecodeRaw/CMakeLists.txt

@@ -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)

projects/rocdecode/samples/videoDecodeRaw/videodecoderaw.cpp

@@ -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 {

projects/rocdecode/samples/videoToSequence/CMakeLists.txt

@@ -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