Updates to rocDecode and rocJPEG samples (#166)

* Edit CMakeList files and include paths for library headers. [ROCm/rocprofiler-systems commit: e805c0f3e7]
2025-04-16 17:12:21 -04:00
parent 6a960a1edb
commit b5b5bac8b2
6 changed files with 11 additions and 26 deletions
@@ -20,6 +20,7 @@ endif()
 set(CMAKE_CXX_STANDARD 17)

 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
+list(APPEND CMAKE_PREFIX_PATH ${ROCmVersion_DIR}/lib/cmake ${ROCmVersion_DIR})
 list(APPEND CMAKE_PREFIX_PATH ${ROCmVersion_DIR}/hip ${ROCmVersion_DIR})
 list(APPEND CMAKE_MODULE_PATH ${ROCmVersion_DIR}/share/rocdecode/cmake)

@@ -49,29 +50,12 @@ function(videodecode_message _MSG_TYPE)
 endfunction()

 # Find RocDecode
-find_package(rocDecode QUIET)
+find_package(ROCDECODE QUIET)
 if(NOT ROCDECODE_FOUND)
    videodecode_message(AUTHOR_WARNING "${PROJECT_NAME} skipped. Missing RocDecode...")
    return()
 endif()

-find_path(
-    ROCDECODE_INCLUDE_DIR
-    NAMES rocdecode.h
-    PATHS ${ROCmVersion_DIR}/include/rocdecode)
-find_library(
-    ROCDECODE_LIBRARY
-    NAMES rocdecode
-    HINTS ${ROCmVersion_DIR}/lib)
-
-mark_as_advanced(ROCDECODE_INCLUDE_DIR ROCDECODE_LIBRARY)
-
-if(ROCDECODE_INCLUDE_DIR AND ROCDECODE_LIBRARY)
-    set(ROCDECODE_FOUND TRUE)
-else()
-    videodecode_message(AUTHOR_WARNING "${PROJECT_NAME} skipped. Missing RocDecode ...")
-endif()
-
 # Copy video files to build directory
 if(EXISTS "${ROCmVersion_DIR}/share/rocdecode/video")
    if(NOT EXISTS "${CMAKE_BINARY_DIR}/videos")
@@ -40,11 +40,11 @@ THE SOFTWARE.
 #include <vector>
 extern "C"
 {
-#include "libavutil/md5.h"
-#include "libavutil/mem.h"
+#include <libavutil/md5.h>
+#include <libavutil/mem.h>
 }
-#include "rocdecode.h"
-#include "rocparser.h"
+#include <rocdecode/rocdecode.h>
+#include <rocdecode/rocparser.h>

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

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

 /*!
 * \file
@@ -726,4 +726,4 @@ main(int argc, char** argv)
    }

    return 0;
-}
+}